[gtksourceview/gnome-3-24] language-specs: sync all *.lang files from GtkSourceView 4



commit 6413de326828fa68c5825f0336ea308e8c79234d
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sun Jan 14 11:40:08 2018 +0100

    language-specs: sync all *.lang files from GtkSourceView 4
    
    gedit is unmaintained, and still uses deprecated GtkSourceView 3 APIs.
    So it's unlikely that gedit will use GtkSourceView 4 in the near future.
    
    So from time to time the *.lang files can be synced from GtkSourceView 4
    to GtkSourceView 3, so that gedit (and other GSV 3 apps) benefit from
    the latest improvements for syntax highlighting, and support for new
    languages.
    
    Since it is the first time that the *.lang files are synced, a lot of
    strings are no longer translatable, see the commits in GtkSourceView 4
    for more details.
    
    Normally this commit should not add new translatable strings.

 data/language-specs/Makefile.am           |   19 +-
 data/language-specs/R.lang                |   25 +-
 data/language-specs/abnf.lang             |   19 +-
 data/language-specs/actionscript.lang     |   33 +-
 data/language-specs/ada.lang              |   29 +-
 data/language-specs/ansforth94.lang       |   33 +-
 data/language-specs/asp.lang              |   31 +-
 data/language-specs/automake.lang         |   23 +-
 data/language-specs/awk.lang              |   15 +-
 data/language-specs/bennugd.lang          |   27 +-
 data/language-specs/bibtex.lang           |   13 +-
 data/language-specs/bluespec.lang         |   19 +-
 data/language-specs/boo.lang              |   33 +-
 data/language-specs/c.lang                |   47 +-
 data/language-specs/cg.lang               |   39 +-
 data/language-specs/changelog.lang        |   22 +-
 data/language-specs/chdr.lang             |    5 +-
 data/language-specs/cmake.lang            |  368 +++-
 data/language-specs/cobol.lang            |   25 +-
 data/language-specs/cpp.lang              |   13 +-
 data/language-specs/cpphdr.lang           |    5 +-
 data/language-specs/csharp.lang           |   36 +-
 data/language-specs/css.lang              |   36 +-
 data/language-specs/csv.lang              |   15 +-
 data/language-specs/cuda.lang             |   17 +-
 data/language-specs/d.lang                |   33 +-
 data/language-specs/def.lang              |   77 +-
 data/language-specs/desktop.lang          |   29 +-
 data/language-specs/diff.lang             |   21 +-
 data/language-specs/docbook.lang          |   15 +-
 data/language-specs/dosbatch.lang         |   13 +-
 data/language-specs/dot.lang              |   15 +-
 data/language-specs/dpatch.lang           |    9 +-
 data/language-specs/dtd.lang              |   15 +-
 data/language-specs/dtl.lang              |   22 +-
 data/language-specs/eiffel.lang           |   35 +-
 data/language-specs/erlang.lang           |   34 +-
 data/language-specs/fcl.lang              |   14 +-
 data/language-specs/forth.lang            |   25 +-
 data/language-specs/fortran.lang          |   31 +-
 data/language-specs/fsharp.lang           |   44 +-
 data/language-specs/gap.lang              |   17 +-
 data/language-specs/gdb-log.lang          |   25 +-
 data/language-specs/genie.lang            |   35 +-
 data/language-specs/glsl.lang             |   19 +-
 data/language-specs/go.lang               |   39 +-
 data/language-specs/groovy.lang           |  337 +++
 data/language-specs/gtk-doc.lang          |   29 +-
 data/language-specs/gtkrc.lang            |   23 +-
 data/language-specs/haddock.lang          |   35 +-
 data/language-specs/haskell-literate.lang |    7 +-
 data/language-specs/haskell.lang          |   33 +-
 data/language-specs/haxe.lang             |   41 +-
 data/language-specs/html.lang             |   31 +-
 data/language-specs/idl-exelis.lang       |   23 +-
 data/language-specs/idl.lang              |   17 +-
 data/language-specs/imagej.lang           |   23 +-
 data/language-specs/ini.lang              |   23 +-
 data/language-specs/j.lang                |   39 +-
 data/language-specs/jade.lang             |   25 +-
 data/language-specs/java.lang             |   37 +-
 data/language-specs/javascript.lang       |   31 +-
 data/language-specs/json.lang             |   21 +-
 data/language-specs/julia.lang            |   33 +-
 data/language-specs/language-specs.pot    | 3639 +----------------------------
 data/language-specs/latex.lang            |   41 +-
 data/language-specs/lex.lang              |   15 +-
 data/language-specs/libtool.lang          |   11 +-
 data/language-specs/llvm.lang             |   25 +-
 data/language-specs/lua.lang              |   25 +-
 data/language-specs/m4.lang               |   15 +-
 data/language-specs/makefile.lang         |   27 +-
 data/language-specs/mallard.lang          |   15 +-
 data/language-specs/markdown.lang         |   35 +-
 data/language-specs/matlab.lang           |   13 +-
 data/language-specs/mediawiki.lang        |   35 +-
 data/language-specs/meson.lang            |   15 +-
 data/language-specs/modelica.lang         |   31 +-
 data/language-specs/mxml.lang             |   11 +-
 data/language-specs/nemerle.lang          |   35 +-
 data/language-specs/netrexx.lang          |   35 +-
 data/language-specs/nsis.lang             |   15 +-
 data/language-specs/objc.lang             |   15 +-
 data/language-specs/objj.lang             |   21 +-
 data/language-specs/ocaml.lang            |   45 +-
 data/language-specs/ocl.lang              |   19 +-
 data/language-specs/octave.lang           |   27 +-
 data/language-specs/ooc.lang              |   41 +-
 data/language-specs/opal.lang             |   27 +-
 data/language-specs/opencl.lang           |   21 +-
 data/language-specs/pascal.lang           |   19 +-
 data/language-specs/perl.lang             |   45 +-
 data/language-specs/php.lang              |   45 +-
 data/language-specs/pig.lang              |   19 +-
 data/language-specs/pkgconfig.lang        |   11 +-
 data/language-specs/po.lang               |   17 +-
 data/language-specs/prolog.lang           |   23 +-
 data/language-specs/protobuf.lang         |   14 +-
 data/language-specs/puppet.lang           |   21 +-
 data/language-specs/python.lang           |   45 +-
 data/language-specs/python3.lang          |   37 +-
 data/language-specs/rpmspec.lang          |   32 +-
 data/language-specs/rst.lang              |   25 +-
 data/language-specs/ruby.lang             |   52 +-
 data/language-specs/rust.lang             |   31 +-
 data/language-specs/scala.lang            |   37 +-
 data/language-specs/scheme.lang           |   17 +-
 data/language-specs/scilab.lang           |   21 +-
 data/language-specs/sh.lang               |   27 +-
 data/language-specs/sml.lang              |   29 +-
 data/language-specs/sparql.lang           |   33 +-
 data/language-specs/sql.lang              |   23 +-
 data/language-specs/sweave.lang           |   13 +-
 data/language-specs/systemverilog.lang    |   15 +-
 data/language-specs/t2t.lang              |   37 +-
 data/language-specs/tcl.lang              |   11 +-
 data/language-specs/texinfo.lang          |   25 +-
 data/language-specs/thrift.lang           |   15 +-
 data/language-specs/vala.lang             |   25 +-
 data/language-specs/vbnet.lang            |   21 +-
 data/language-specs/verilog.lang          |   35 +-
 data/language-specs/vhdl.lang             |   25 +-
 data/language-specs/xml.lang              |   29 +-
 data/language-specs/xslt.lang             |   11 +-
 data/language-specs/yacc.lang             |   13 +-
 data/language-specs/yaml.lang             |   31 +-
 po/POTFILES.skip                          |    1 +
 127 files changed, 2317 insertions(+), 5189 deletions(-)
---
diff --git a/data/language-specs/Makefile.am b/data/language-specs/Makefile.am
index 7e4f0a2..98c8371 100644
--- a/data/language-specs/Makefile.am
+++ b/data/language-specs/Makefile.am
@@ -1,8 +1,8 @@
 TESTS = check-language.sh
 
 LANGUAGES =                    \
-       actionscript.lang       \
        abnf.lang               \
+       actionscript.lang       \
        ada.lang                \
        ansforth94.lang         \
        asp.lang                \
@@ -12,14 +12,14 @@ LANGUAGES =                 \
        bibtex.lang             \
        bluespec.lang           \
        boo.lang                \
-       changelog.lang          \
-       c.lang                  \
        cg.lang                 \
+       changelog.lang          \
        chdr.lang               \
+       c.lang                  \
        cmake.lang              \
        cobol.lang              \
-       cpp.lang                \
        cpphdr.lang             \
+       cpp.lang                \
        csharp.lang             \
        css.lang                \
        csv.lang                \
@@ -27,13 +27,13 @@ LANGUAGES =                 \
        def.lang                \
        desktop.lang            \
        diff.lang               \
-       dtl.lang                \
        d.lang                  \
        docbook.lang            \
        dosbatch.lang           \
        dot.lang                \
        dpatch.lang             \
        dtd.lang                \
+       dtl.lang                \
        eiffel.lang             \
        erlang.lang             \
        fcl.lang                \
@@ -45,6 +45,7 @@ LANGUAGES =                   \
        genie.lang              \
        glsl.lang               \
        go.lang                 \
+       groovy.lang             \
        gtk-doc.lang            \
        gtkrc.lang              \
        haddock.lang            \
@@ -52,14 +53,14 @@ LANGUAGES =                 \
        haskell-literate.lang   \
        haxe.lang               \
        html.lang               \
-       idl.lang                \
        idl-exelis.lang         \
+       idl.lang                \
        imagej.lang             \
        ini.lang                \
-       j.lang                  \
        jade.lang               \
        java.lang               \
        javascript.lang         \
+       j.lang                  \
        json.lang               \
        julia.lang              \
        kotlin.lang             \
@@ -96,11 +97,11 @@ LANGUAGES =                 \
        pig.lang                \
        pkgconfig.lang          \
        po.lang                 \
-       python.lang             \
-       python3.lang            \
        prolog.lang             \
        protobuf.lang           \
        puppet.lang             \
+       python3.lang            \
+       python.lang             \
        R.lang                  \
        rpmspec.lang            \
        rst.lang                \
diff --git a/data/language-specs/R.lang b/data/language-specs/R.lang
index c07a2f9..a2c1578 100644
--- a/data/language-specs/R.lang
+++ b/data/language-specs/R.lang
@@ -17,13 +17,12 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 <!-- Translators: It is the section for a set of languages related for this purpose -->
-<language id="r" _name="R" version="2.0" _section="Scientific">
+<language id="r" name="R" version="2.0" _section="Scientific">
   <metadata>
     <property name="mimetypes">text/x-R</property>
     <property name="globs">*.R;*.Rout;*.r;*.Rhistory;*.Rt;*.Rout.save;*.Rout.fail</property>
@@ -31,15 +30,15 @@
   </metadata>
 
   <styles>
-    <style id="keyword"             _name="Keyword"               map-to="def:keyword"/>
-    <style id="reserved-classes"    _name="Reserved Class"        map-to="def:type"/>
-    <style id="assignment-operator" _name="Assignment Operator"   map-to="def:operator"/>
-    <style id="delimiter"           _name="Delimiter"             map-to="def:operator"/>
-    <style id="special-constant"    _name="Special Constant"      map-to="def:special-constant"/>
-    <style id="boolean"             _name="Boolean value"         map-to="def:boolean"/>
-    <style id="integer-number"      _name="Integer Number"        map-to="def:base-n-integer"/>
-    <style id="floating-point"      _name="Floating point number" map-to="def:floating-point"/>
-    <style id="functions"           _name="Functions"             map-to="def:function"/>
+    <style id="keyword"             name="Keyword"               map-to="def:keyword"/>
+    <style id="reserved-classes"    name="Reserved Class"        map-to="def:type"/>
+    <style id="assignment-operator" name="Assignment Operator"   map-to="def:operator"/>
+    <style id="delimiter"           name="Delimiter"             map-to="def:operator"/>
+    <style id="special-constant"    name="Special Constant"      map-to="def:special-constant"/>
+    <style id="boolean"             name="Boolean value"         map-to="def:boolean"/>
+    <style id="integer-number"      name="Integer Number"        map-to="def:base-n-integer"/>
+    <style id="floating-point"      name="Floating point number" map-to="def:floating-point"/>
+    <style id="functions"           name="Functions"             map-to="def:function"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/abnf.lang b/data/language-specs/abnf.lang
index f7b7bdc..a750d84 100644
--- a/data/language-specs/abnf.lang
+++ b/data/language-specs/abnf.lang
@@ -16,9 +16,8 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
@@ -28,19 +27,19 @@ References:
        https://tools.ietf.org/html/rfc5234
        https://tools.ietf.org/html/rfc7405
 -->
-<language id="abnf" _name="ABNF" version="2.0" _section="Source">
+<language id="abnf" name="ABNF" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.abnf</property>
     <property name="line-comment-start">;</property>
   </metadata>
 
   <styles>
-    <style id="comment"     _name="Comment"            map-to="def:comment"/>
-    <style id="rulename"    _name="Rule Name"          map-to="def:type"/>
-    <style id="binary"      _name="Binary number"      map-to="def:base-n-integer"/>
-    <style id="decimal"     _name="Decimal number"     map-to="def:decimal"/>
-    <style id="hexadecimal" _name="Hexadecimal number" map-to="def:base-n-integer"/>
-    <style id="string"      _name="String"             map-to="def:string"/>
+    <style id="comment"     name="Comment"            map-to="def:comment"/>
+    <style id="rulename"    name="Rule Name"          map-to="def:type"/>
+    <style id="binary"      name="Binary number"      map-to="def:base-n-integer"/>
+    <style id="decimal"     name="Decimal number"     map-to="def:decimal"/>
+    <style id="hexadecimal" name="Hexadecimal number" map-to="def:base-n-integer"/>
+    <style id="string"      name="String"             map-to="def:string"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/actionscript.lang b/data/language-specs/actionscript.lang
index 6b4b754..9f70fb3 100644
--- a/data/language-specs/actionscript.lang
+++ b/data/language-specs/actionscript.lang
@@ -17,12 +17,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="actionscript" _name="ActionScript" version="2.0" _section="Source">
+<language id="actionscript" name="ActionScript" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-actionscript</property>
     <property name="globs">*.as</property>
@@ -32,19 +31,19 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="external" _name="External" map-to="def:preprocessor"/>
-    <style id="declaration" _name="Declaration" map-to="def:type"/>
-    <style id="storage-class" _name="Storage Class" map-to="def:type"/>
-    <style id="scope-declaration" _name="Scope Declaration" map-to="def:type"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="number" _name="Number" map-to="def:decimal"/>
-    <style id="reserved" _name="Future Reserved Keywords" map-to="def:error"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="external" name="External" map-to="def:preprocessor"/>
+    <style id="declaration" name="Declaration" map-to="def:type"/>
+    <style id="storage-class" name="Storage Class" map-to="def:type"/>
+    <style id="scope-declaration" name="Scope Declaration" map-to="def:type"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="null-value" name="Null Value" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="number" name="Number" map-to="def:decimal"/>
+    <style id="reserved" name="Future Reserved Keywords" map-to="def:error"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/ada.lang b/data/language-specs/ada.lang
index 35df886..085dc68 100644
--- a/data/language-specs/ada.lang
+++ b/data/language-specs/ada.lang
@@ -18,12 +18,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="ada" _name="Ada" version="2.0" _section="Source">
+<language id="ada" name="Ada" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-ada;text/x-adasrc</property>
     <property name="globs">*.adb;*.ads</property>
@@ -31,17 +30,17 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="storage-class" _name="Storage Class" map-to="def:type"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="base-n-number" _name="Arbitrary base number" map-to="def:base-n-integer"/>
-    <style id="real" _name="Real number" map-to="def:floating-point"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="storage-class" name="Storage Class" map-to="def:type"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="base-n-number" name="Arbitrary base number" map-to="def:base-n-integer"/>
+    <style id="real" name="Real number" map-to="def:floating-point"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/ansforth94.lang b/data/language-specs/ansforth94.lang
index 605e8af..98f74b1 100644
--- a/data/language-specs/ansforth94.lang
+++ b/data/language-specs/ansforth94.lang
@@ -16,13 +16,12 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
-<language id="ansforth94" _name="ANS-Forth94" version="2.0" _section="Source">
+<language id="ansforth94" name="ANS-Forth94" version="2.0" _section="Source">
 
   <metadata>
     <property name="mimetypes">text/x-forth</property>
@@ -33,20 +32,20 @@
   </metadata>
 
   <styles>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="obs-keyword" _name="Obsolete Keyword" map-to="def:keyword"/>
-
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="alert" _name="Alert" map-to="def:note"/>
-    <style id="character" _name="Character" map-to="def:character"/>
-    <style id="word" _name="Word" map-to="def:function"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="constant" _name="Constant" map-to="def:constant"/>
-    <style id="variable" _name="Variable" map-to="def:type"/>
-    <style id="local-variable" _name="Local Variable" map-to="def:type"/>
-    <style id="single-number" _name="Single Number" map-to="def:base-n-integer"/>
-    <style id="double-number" _name="Double Number" map-to="def:base-n-integer"/>
-    <style id="float" _name="Float" map-to="def:floating-point"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="obs-keyword" name="Obsolete Keyword" map-to="def:keyword"/>
+
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="alert" name="Alert" map-to="def:note"/>
+    <style id="character" name="Character" map-to="def:character"/>
+    <style id="word" name="Word" map-to="def:function"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="constant" name="Constant" map-to="def:constant"/>
+    <style id="variable" name="Variable" map-to="def:type"/>
+    <style id="local-variable" name="Local Variable" map-to="def:type"/>
+    <style id="single-number" name="Single Number" map-to="def:base-n-integer"/>
+    <style id="double-number" name="Double Number" map-to="def:base-n-integer"/>
+    <style id="float" name="Float" map-to="def:floating-point"/>
   </styles>
 
 
diff --git a/data/language-specs/asp.lang b/data/language-specs/asp.lang
index 55b8a29..1160ce0 100644
--- a/data/language-specs/asp.lang
+++ b/data/language-specs/asp.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="asp" _name="ASP" version="2.0" _section="Source">
+<language id="asp" name="ASP" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-asp;application/x-asp;application/x-asap</property>
     <property name="globs">*.asp</property>
@@ -29,18 +28,18 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="function" _name="Function" map-to="def:function"/>
-    <style id="operator" _name="Operator" map-to="def:operator"/>
-    <style id="object" _name="ASP Object" map-to="def:type"/>
-    <style id="constant" _name="VBScript and ADO constants" map-to="def:constant"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="special-constant" _name="Special constant" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="number" _name="Number" map-to="def:decimal"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="function" name="Function" map-to="def:function"/>
+    <style id="operator" name="Operator" map-to="def:operator"/>
+    <style id="object" name="ASP Object" map-to="def:type"/>
+    <style id="constant" name="VBScript and ADO constants" map-to="def:constant"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="special-constant" name="Special constant" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="number" name="Number" map-to="def:decimal"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/automake.lang b/data/language-specs/automake.lang
index 777d2e8..43869d4 100644
--- a/data/language-specs/automake.lang
+++ b/data/language-specs/automake.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="automake" _name="Automake" version="2.0" _section="Source">
+<language id="automake" name="Automake" version="2.0" _section="Source">
   <metadata>
     <property name="globs">Makefile.am;GNUmakefile.am</property>
     <property name="line-comment-start">#</property>
@@ -36,14 +35,14 @@
   -->
 
   <styles>
-    <style id="lhs"       _name="Automake Variable" map-to="def:identifier"/>
-    <style id="primary"   _name="Primary"           map-to="def:type"/>
-    <style id="secondary" _name="Secondary"         map-to="def:statement"/>
-    <style id="prefix"    _name="Prefix"            map-to="def:statement"/>
-    <style id="target"    _name="Optional Target"   map-to="def:statement"/>
-    <style id="dirname"   _name="Built-in Target"   map-to="def:statement"/>
-    <style id="keyword"   _name="Other Keyword"     map-to="def:statement"/>
-    <style id="subst"     _name="Substitution"      map-to="def:preprocessor"/>
+    <style id="lhs"       name="Automake Variable" map-to="def:identifier"/>
+    <style id="primary"   name="Primary"           map-to="def:type"/>
+    <style id="secondary" name="Secondary"         map-to="def:statement"/>
+    <style id="prefix"    name="Prefix"            map-to="def:statement"/>
+    <style id="target"    name="Optional Target"   map-to="def:statement"/>
+    <style id="dirname"   name="Built-in Target"   map-to="def:statement"/>
+    <style id="keyword"   name="Other Keyword"     map-to="def:statement"/>
+    <style id="subst"     name="Substitution"      map-to="def:preprocessor"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/awk.lang b/data/language-specs/awk.lang
index 0ff37e5..9de238d 100644
--- a/data/language-specs/awk.lang
+++ b/data/language-specs/awk.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="awk" _name="awk" version="2.0" _section="Script">
+<language id="awk" name="awk" version="2.0" _section="Script">
   <metadata>
     <property name="mimetypes">application/x-awk</property>
     <property name="globs">*.awk</property>
@@ -29,10 +28,10 @@
   </metadata>
 
   <styles>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="pattern" _name="Pattern" map-to="def:preprocessor"/>
-    <style id="variable" _name="Variable" map-to="def:identifier"/>
-    <style id="builtin-function" _name="Builtin Function" map-to="def:builtin"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="pattern" name="Pattern" map-to="def:preprocessor"/>
+    <style id="variable" name="Variable" map-to="def:identifier"/>
+    <style id="builtin-function" name="Builtin Function" map-to="def:builtin"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/bennugd.lang b/data/language-specs/bennugd.lang
index d0c8c84..8070263 100644
--- a/data/language-specs/bennugd.lang
+++ b/data/language-specs/bennugd.lang
@@ -15,12 +15,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="bennugd" _name="BennuGD" version="2.0" _section="Source">
+<language id="bennugd" name="BennuGD" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.prg</property>
     <property name="line-comment-start">//</property>
@@ -29,16 +28,16 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"               map-to="def:comment"/>
-    <style id="preprocessor"      _name="Preprocessor"          map-to="def:preprocessor"/>
-    <style id="identifier"        _name="Identifier"            map-to="def:identifier"/>
-    <style id="operator"          _name="Operator"              map-to="def:operator"/>
-    <style id="keywords"          _name="Keyword"               map-to="def:keyword"/>
-    <style id="types"             _name="Data Type"             map-to="def:type"/>
-    <style id="floating-point"    _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal"           _name="Decimal number"        map-to="def:decimal"/>
-    <style id="hexadecimal"       _name="Hexadecimal number"    map-to="def:base-n-integer"/>
-    <style id="boolean"           _name="Boolean value"         map-to="def:boolean"/>
+    <style id="comment"           name="Comment"               map-to="def:comment"/>
+    <style id="preprocessor"      name="Preprocessor"          map-to="def:preprocessor"/>
+    <style id="identifier"        name="Identifier"            map-to="def:identifier"/>
+    <style id="operator"          name="Operator"              map-to="def:operator"/>
+    <style id="keywords"          name="Keyword"               map-to="def:keyword"/>
+    <style id="types"             name="Data Type"             map-to="def:type"/>
+    <style id="floating-point"    name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal"           name="Decimal number"        map-to="def:decimal"/>
+    <style id="hexadecimal"       name="Hexadecimal number"    map-to="def:base-n-integer"/>
+    <style id="boolean"           name="Boolean value"         map-to="def:boolean"/>
   </styles>
 
   <default-regex-options case-sensitive="false" />
diff --git a/data/language-specs/bibtex.lang b/data/language-specs/bibtex.lang
index 9a2ce3b..b074cd0 100644
--- a/data/language-specs/bibtex.lang
+++ b/data/language-specs/bibtex.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="bibtex" _name="BibTeX" version="2.0" _section="Markup">
+<language id="bibtex" name="BibTeX" version="2.0" _section="Markup">
   <metadata>
     <property name="mimetypes">text/x-bibtex</property>
     <property name="globs">*.bib</property>
@@ -29,9 +28,9 @@
   </metadata>
 
   <styles>
-    <style id="entry-type" _name="Entries" map-to="def:keyword"/>
-    <style id="field"      _name="Field"   map-to="def:identifier"/>
-    <style id="string"     _name="String"  map-to="def:string"/>
+    <style id="entry-type" name="Entries" map-to="def:keyword"/>
+    <style id="field"      name="Field"   map-to="def:identifier"/>
+    <style id="string"     name="String"  map-to="def:string"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/bluespec.lang b/data/language-specs/bluespec.lang
index ee53a67..3105894 100644
--- a/data/language-specs/bluespec.lang
+++ b/data/language-specs/bluespec.lang
@@ -14,12 +14,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="bluespec" _name="Bluespec SystemVerilog" version="2.0" _section="Source">
+<language id="bluespec" name="Bluespec SystemVerilog" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.bsv</property>
     <property name="line-comment-start">//</property>
@@ -28,12 +27,12 @@
   </metadata>
 
   <styles>
-    <style id="system-task" _name="System Task" map-to="def:keyword"/>
-    <style id="annotation" _name="Annotation" map-to="def:function"/>
-    <style id="attribute" _name="Attribute" map-to="def:type"/>
-    <style id="import-bvi" _name="Import BVI" map-to="def:keyword"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="type" _name="Type" map-to="def:type"/>
+    <style id="system-task" name="System Task" map-to="def:keyword"/>
+    <style id="annotation" name="Annotation" map-to="def:function"/>
+    <style id="attribute" name="Attribute" map-to="def:type"/>
+    <style id="import-bvi" name="Import BVI" map-to="def:keyword"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="type" name="Type" map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/boo.lang b/data/language-specs/boo.lang
index 2b1e176..10b4a9d 100644
--- a/data/language-specs/boo.lang
+++ b/data/language-specs/boo.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="boo" _name="Boo" version="2.0" _section="Source">
+<language id="boo" name="Boo" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-boo</property>
     <property name="globs">*.boo</property>
@@ -31,19 +30,19 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"             map-to="def:comment"/>
-    <style id="multiline-string"  _name="Multiline string"    map-to="def:string"/>
-    <style id="string"            _name="String"              map-to="def:string"/>
-    <style id="regex"             _name="Regular Expression"  map-to="def:string"/>
-    <style id="namespace"         _name="Namespace"           map-to="def:preprocessor"/>
-    <style id="type"              _name="Data Type"           map-to="def:type"/>
-    <style id="definition"        _name="Definition"          map-to="def:keyword"/>
-    <style id="keyword"           _name="Keyword"             map-to="def:keyword"/>
-    <style id="special-variable"  _name="Special Variable"    map-to="def:identifier"/>
-    <style id="null-value"        _name="Null Value"          map-to="def:special-constant"/>
-    <style id="boolean"           _name="Boolean"             map-to="def:boolean"/>
-    <style id="number"            _name="Number"              map-to="def:number"/>
-    <style id="builtin"           _name="Builtin Function"    map-to="def:builtin"/>
+    <style id="comment"           name="Comment"             map-to="def:comment"/>
+    <style id="multiline-string"  name="Multiline string"    map-to="def:string"/>
+    <style id="string"            name="String"              map-to="def:string"/>
+    <style id="regex"             name="Regular Expression"  map-to="def:string"/>
+    <style id="namespace"         name="Namespace"           map-to="def:preprocessor"/>
+    <style id="type"              name="Data Type"           map-to="def:type"/>
+    <style id="definition"        name="Definition"          map-to="def:keyword"/>
+    <style id="keyword"           name="Keyword"             map-to="def:keyword"/>
+    <style id="special-variable"  name="Special Variable"    map-to="def:identifier"/>
+    <style id="null-value"        name="Null Value"          map-to="def:special-constant"/>
+    <style id="boolean"           name="Boolean"             map-to="def:boolean"/>
+    <style id="number"            name="Number"              map-to="def:number"/>
+    <style id="builtin"           name="Builtin Function"    map-to="def:builtin"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/c.lang b/data/language-specs/c.lang
index e332a38..12f6010 100644
--- a/data/language-specs/c.lang
+++ b/data/language-specs/c.lang
@@ -17,12 +17,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="c" _name="C" version="2.0" _section="Source">
+<language id="c" name="C" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-c;text/x-csrc;image/x-xpixmap</property>
     <property name="globs">*.c</property>
@@ -32,26 +31,26 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"               map-to="def:comment"/>
-    <style id="string"            _name="String"                map-to="def:string"/>
-    <style id="preprocessor"      _name="Preprocessor"          map-to="def:preprocessor"/>
-    <style id="common-defines"    _name="Common Defines"        map-to="def:special-constant"/>
-    <style id="included-file"     _name="Included File"         map-to="def:string"/>
-    <style id="char"              _name="Character"             map-to="def:character"/>
-    <style id="keyword"           _name="Keyword"               map-to="def:keyword"/>
-    <style id="operator"          _name="Operator"              map-to="def:operator"/>
-    <style id="type"              _name="Data Type"             map-to="def:type"/>
-    <style id="storage-class"     _name="Storage Class"         map-to="def:type"/>
-    <style id="printf"            _name="printf Conversion"     map-to="def:special-char"/>
-    <style id="escaped-character" _name="Escaped Character"     map-to="def:special-char"/>
-    <style id="floating-point"    _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal"           _name="Decimal number"        map-to="def:decimal"/>
-    <style id="octal"             _name="Octal number"          map-to="def:base-n-integer"/>
-    <style id="hexadecimal"       _name="Hexadecimal number"    map-to="def:base-n-integer"/>
-    <style id="boolean"           _name="Boolean value"         map-to="def:boolean"/>
-    <style id="standard-stream"   _name="Standard stream"       map-to="def:constant"/>
-    <style id="signal-name"       _name="Signal name"           map-to="def:constant"/>
-    <style id="error"             _name="Error"                 map-to="def:error"/>
+    <style id="comment"           name="Comment"               map-to="def:comment"/>
+    <style id="string"            name="String"                map-to="def:string"/>
+    <style id="preprocessor"      name="Preprocessor"          map-to="def:preprocessor"/>
+    <style id="common-defines"    name="Common Defines"        map-to="def:special-constant"/>
+    <style id="included-file"     name="Included File"         map-to="def:string"/>
+    <style id="char"              name="Character"             map-to="def:character"/>
+    <style id="keyword"           name="Keyword"               map-to="def:keyword"/>
+    <style id="operator"          name="Operator"              map-to="def:operator"/>
+    <style id="type"              name="Data Type"             map-to="def:type"/>
+    <style id="storage-class"     name="Storage Class"         map-to="def:type"/>
+    <style id="printf"            name="printf Conversion"     map-to="def:special-char"/>
+    <style id="escaped-character" name="Escaped Character"     map-to="def:special-char"/>
+    <style id="floating-point"    name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal"           name="Decimal number"        map-to="def:decimal"/>
+    <style id="octal"             name="Octal number"          map-to="def:base-n-integer"/>
+    <style id="hexadecimal"       name="Hexadecimal number"    map-to="def:base-n-integer"/>
+    <style id="boolean"           name="Boolean value"         map-to="def:boolean"/>
+    <style id="standard-stream"   name="Standard stream"       map-to="def:constant"/>
+    <style id="signal-name"       name="Signal name"           map-to="def:constant"/>
+    <style id="error"             name="Error"                 map-to="def:error"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/cg.lang b/data/language-specs/cg.lang
index a2d0359..fe5d573 100644
--- a/data/language-specs/cg.lang
+++ b/data/language-specs/cg.lang
@@ -16,9 +16,8 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 <language id="cg" _name="CG Shader Language" version="2.0" _section="Source">
@@ -30,23 +29,23 @@
     </metadata>
 
     <styles>
-        <style id="comment"           _name="Comment"             map-to="def:comment"/>
-        <style id="error"             _name="Error"               map-to="def:error"/>
-        <style id="preprocessor"      _name="Preprocessor"        map-to="def:preprocessor"/>
-        <style id="bindings"          _name="Bindings"            map-to="def:special-constant"/>
-        <style id="included-file"     _name="Included File"       map-to="def:string"/>
-        <style id="keyword"           _name="Keyword"             map-to="def:keyword"/>
-        <style id="type"              _name="Data Type"           map-to="def:type"/>
-        <style id="storage-class"     _name="Storage Class"       map-to="def:builtin"/>
-        <style id="escaped-character" _name="Escaped Character"   map-to="def:special-char"/>
-        <style id="floating-point"    _name="Floating point number" map-to="def:floating-point"/>
-        <style id="decimal"           _name="Decimal number"      map-to="def:decimal"/>
-        <style id="octal"             _name="Octal number"        map-to="def:base-n-integer"/>
-        <style id="hexadecimal"       _name="Hexadecimal number"  map-to="def:base-n-integer"/>
-        <style id="boolean"           _name="Boolean value"       map-to="def:boolean"/>
-        <style id="swizzle"           _name="Swizzle operator"    map-to="def:operator"/>
-        <style id="function"          _name="Function"            map-to="def:function"/>
-        <style id="builtin"           _name="Builtin"             map-to="def:preprocessor"/>
+        <style id="comment"           name="Comment"             map-to="def:comment"/>
+        <style id="error"             name="Error"               map-to="def:error"/>
+        <style id="preprocessor"      name="Preprocessor"        map-to="def:preprocessor"/>
+        <style id="bindings"          name="Bindings"            map-to="def:special-constant"/>
+        <style id="included-file"     name="Included File"       map-to="def:string"/>
+        <style id="keyword"           name="Keyword"             map-to="def:keyword"/>
+        <style id="type"              name="Data Type"           map-to="def:type"/>
+        <style id="storage-class"     name="Storage Class"       map-to="def:builtin"/>
+        <style id="escaped-character" name="Escaped Character"   map-to="def:special-char"/>
+        <style id="floating-point"    name="Floating point number" map-to="def:floating-point"/>
+        <style id="decimal"           name="Decimal number"      map-to="def:decimal"/>
+        <style id="octal"             name="Octal number"        map-to="def:base-n-integer"/>
+        <style id="hexadecimal"       name="Hexadecimal number"  map-to="def:base-n-integer"/>
+        <style id="boolean"           name="Boolean value"       map-to="def:boolean"/>
+        <style id="swizzle"           name="Swizzle operator"    map-to="def:operator"/>
+        <style id="function"          name="Function"            map-to="def:function"/>
+        <style id="builtin"           name="Builtin"             map-to="def:preprocessor"/>
     </styles>
 
     <definitions>
diff --git a/data/language-specs/changelog.lang b/data/language-specs/changelog.lang
index 006ea8c..e9d3b54 100644
--- a/data/language-specs/changelog.lang
+++ b/data/language-specs/changelog.lang
@@ -17,12 +17,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="changelog" _name="ChangeLog" version="2.0" _section="Other">
+<language id="changelog" name="ChangeLog" version="2.0" _section="Other">
 
   <metadata>
     <property name="mimetypes">text/x-changelog</property>
@@ -30,14 +29,13 @@
   </metadata>
 
   <styles>
-    <style id="date" _name="Date" map-to="def:number"/>
-    <!-- Translators: the name of a person, not an object. -->
-    <style id="name" _name="Name" map-to="def:statement"/>
-    <style id="email" _name="E-mail address" map-to="def:identifier"/>
-    <style id="file" _name="File" map-to="def:comment"/>
-    <style id="bullet" _name="Bullet" map-to="def:type"/>
-    <style id="function" _name="Function" map-to="def:function"/>
-    <style id="release" _name="Release" map-to="def:statement"/>
+    <style id="date" name="Date" map-to="def:number"/>
+    <style id="name" name="Name" map-to="def:statement"/>
+    <style id="email" name="E-mail address" map-to="def:identifier"/>
+    <style id="file" name="File" map-to="def:comment"/>
+    <style id="bullet" name="Bullet" map-to="def:type"/>
+    <style id="function" name="Function" map-to="def:function"/>
+    <style id="release" name="Release" map-to="def:statement"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/chdr.lang b/data/language-specs/chdr.lang
index 90894a8..1d61174 100644
--- a/data/language-specs/chdr.lang
+++ b/data/language-specs/chdr.lang
@@ -17,9 +17,8 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 <language id="chdr" _name="C/ObjC Header" version="2.0" _section="Source">
diff --git a/data/language-specs/cmake.lang b/data/language-specs/cmake.lang
index ba2ca72..c9e8dc2 100644
--- a/data/language-specs/cmake.lang
+++ b/data/language-specs/cmake.lang
@@ -16,25 +16,29 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="cmake" _name="CMake" version="2.0" _section="Other">
+<language id="cmake" name="CMake" version="2.0" _section="Other">
   <metadata>
     <property name="globs">CMakeLists.txt;*.cmake;*.cmake.in;*.ctest;*.ctest.in</property>
     <property name="line-comment-start">#</property>
+    <property name="block-comment-start">#[[</property>
+    <property name="block-comment-end">]]</property>
   </metadata>
 
   <styles>
-    <style id="builtin-command" _name="Builtin Command" map-to="def:function"/>
-    <style id="deprecated-builtin-command" _name="Deprecated Builtin Command" map-to="def:warning"/>
-    <style id="builtin-variable" _name="Builtin Variable" map-to="def:builtin"/>
-    <style id="constant" _name="Constant" map-to="def:constant"/>
-    <style id="operator" _name="Operator" map-to="def:operator"/>
-    <style id="control" _name="Control Keyword" map-to="def:keyword"/>
-    <style id="variable" _name="Variable" map-to="makefile:variable"/>
+    <style id="builtin-command" name="Builtin Command" map-to="def:function"/>
+    <style id="deprecated-builtin-command" name="Deprecated Builtin Command" map-to="def:warning"/>
+    <style id="builtin-variable" name="Builtin Variable" map-to="def:builtin"/>
+    <style id="constant" name="Constant" map-to="def:constant"/>
+    <style id="operator" name="Operator" map-to="def:operator"/>
+    <style id="control" name="Control Keyword" map-to="def:keyword"/>
+    <style id="variable" name="Variable" map-to="makefile:variable"/>
+    <style id="quoted-argument" name="Quoted Argument" map-to="def:string"/>
+    <style id="bracket-argument" name="Bracket Argument" map-to="def:string"/>
+    <style id="legacy-syntax" name="Legacy Syntax" map-to="def:warning"/>
   </styles>
 
   <definitions>
@@ -54,9 +58,23 @@
       <keyword>BUILD_COMMAND</keyword>
       <keyword>CMAKE_HOST_SYSTEM_INFORMATION</keyword>
       <keyword>CMAKE_MINIMUM_REQUIRED</keyword>
+      <keyword>CMAKE_PARSE_ARGUMENTS</keyword>
       <keyword>CMAKE_POLICY</keyword>
       <keyword>CONFIGURE_FILE</keyword>
       <keyword>CREATE_TEST_SOURCELIST</keyword>
+      <keyword>CTEST_BUILD</keyword>
+      <keyword>CTEST_CONFIGURE</keyword>
+      <keyword>CTEST_COVERAGE</keyword>
+      <keyword>CTEST_EMPTY_BINARY_DIRECTORY</keyword>
+      <keyword>CTEST_MEMCHECK</keyword>
+      <keyword>CTEST_READ_CUSTOM_FILES</keyword>
+      <keyword>CTEST_RUN_SCRIPT</keyword>
+      <keyword>CTEST_SLEEP</keyword>
+      <keyword>CTEST_START</keyword>
+      <keyword>CTEST_SUBMIT</keyword>
+      <keyword>CTEST_TEST</keyword>
+      <keyword>CTEST_UPDATE</keyword>
+      <keyword>CTEST_UPLOAD</keyword>
       <keyword>DEFINE_PROPERTY</keyword>
       <keyword>ENABLE_LANGUAGE</keyword>
       <keyword>ENABLE_TESTING</keyword>
@@ -79,13 +97,13 @@
       <keyword>INCLUDE</keyword>
       <keyword>INCLUDE_DIRECTORIES</keyword>
       <keyword>INCLUDE_EXTERNAL_MSPROJECT</keyword>
+      <keyword>INCLUDE_GUARD</keyword>
       <keyword>INCLUDE_REGULAR_EXPRESSION</keyword>
       <keyword>INSTALL</keyword>
       <keyword>LINK_DIRECTORIES</keyword>
       <keyword>LINK_LIBRARIES</keyword>
       <keyword>LIST</keyword>
       <keyword>LOAD_CACHE</keyword>
-      <keyword>LOAD_COMMAND</keyword>
       <keyword>MARK_AS_ADVANCED</keyword>
       <keyword>MATH</keyword>
       <keyword>MESSAGE</keyword>
@@ -124,6 +142,7 @@
       <keyword>INSTALL_FILES</keyword>
       <keyword>INSTALL_PROGRAMS</keyword>
       <keyword>INSTALL_TARGETS</keyword>
+      <keyword>LOAD_COMMAND</keyword>
       <keyword>MAKE_DIRECTORY</keyword>
       <keyword>OUTPUT_REQUIRED_FILES</keyword>
       <keyword>REMOVE</keyword>
@@ -137,15 +156,16 @@
 
     <context id="constant" style-ref="constant">
       <prefix>(?i)\b</prefix> <!-- case insensitive -->
-      <keyword>BOOL</keyword>
-      <keyword>CACHE</keyword>
       <keyword>FALSE</keyword>
+      <keyword>IGNORE</keyword>
       <keyword>N</keyword>
       <keyword>NO</keyword>
-      <keyword>ON</keyword>
+      <keyword>(\w+-)?NOTFOUND</keyword>
       <keyword>OFF</keyword>
-      <keyword>NOTFOUND</keyword>
+      <keyword>ON</keyword>
       <keyword>TRUE</keyword>
+      <keyword>Y</keyword>
+      <keyword>YES</keyword>
     </context>
 
     <context id="builtin-variable" style-ref="builtin-variable">
@@ -156,34 +176,57 @@
       <keyword>\w+_VERSION_MINOR</keyword>
       <keyword>\w+_VERSION_PATCH</keyword>
       <keyword>\w+_VERSION_TWEAK</keyword>
+      <keyword>ANDROID</keyword>
       <keyword>APPLE</keyword>
       <keyword>BORLAND</keyword>
       <keyword>BUILD_SHARED_LIBS</keyword>
       <keyword>CMAKE_\w+_POSTFIX</keyword>
+      <keyword>CMAKE_\w+_ANDROID_TOOLCHAIN_MACHINE</keyword>
+      <keyword>CMAKE_\w+_ANDROID_TOOLCHAIN_PREFIX</keyword>
+      <keyword>CMAKE_\w+_ANDROID_TOOLCHAIN_SUFFIX</keyword>
       <keyword>CMAKE_\w+_ARCHIVE_APPEND</keyword>
       <keyword>CMAKE_\w+_ARCHIVE_CREATE</keyword>
       <keyword>CMAKE_\w+_ARCHIVE_FINISH</keyword>
+      <keyword>CMAKE_\w+_CLANG_TIDY</keyword>
       <keyword>CMAKE_\w+_COMPILER</keyword>
       <keyword>CMAKE_\w+_COMPILER_ABI</keyword>
+      <keyword>CMAKE_\w+_COMPILER_AR</keyword>
+      <keyword>CMAKE_\w+_COMPILER_ARCHITECTURE_ID</keyword>
       <keyword>CMAKE_\w+_COMPILER_EXTERNAL_TOOLCHAIN</keyword>
       <keyword>CMAKE_\w+_COMPILER_ID</keyword>
+      <keyword>CMAKE_\w+_COMPILER_LAUNCHER</keyword>
       <keyword>CMAKE_\w+_COMPILER_LOADED</keyword>
+      <keyword>CMAKE_\w+_COMPILER_PREDEFINES_COMMAND</keyword>
+      <keyword>CMAKE_\w+_COMPILER_RANLIB</keyword>
       <keyword>CMAKE_\w+_COMPILER_TARGET</keyword>
       <keyword>CMAKE_\w+_COMPILER_VERSION</keyword>
+      <keyword>CMAKE_\w+_COMPILER_VERSION_INTERNAL</keyword>
       <keyword>CMAKE_\w+_COMPILE_OBJECT</keyword>
+      <keyword>CMAKE_\w+_CPPCHECK</keyword>
+      <keyword>CMAKE_\w+_CPPLINT</keyword>
       <keyword>CMAKE_\w+_CREATE_SHARED_LIBRARY</keyword>
       <keyword>CMAKE_\w+_CREATE_SHARED_MODULE</keyword>
       <keyword>CMAKE_\w+_CREATE_STATIC_LIBRARY</keyword>
       <keyword>CMAKE_\w+_FLAGS</keyword>
       <keyword>CMAKE_\w+_FLAGS_DEBUG</keyword>
+      <keyword>CMAKE_\w+_FLAGS_DEBUG_INIT</keyword>
+      <keyword>CMAKE_\w+_FLAGS_INIT</keyword>
       <keyword>CMAKE_\w+_FLAGS_MINSIZEREL</keyword>
+      <keyword>CMAKE_\w+_FLAGS_MINSIZEREL_INIT</keyword>
       <keyword>CMAKE_\w+_FLAGS_RELEASE</keyword>
+      <keyword>CMAKE_\w+_FLAGS_RELEASE_INIT</keyword>
       <keyword>CMAKE_\w+_FLAGS_RELWITHDEBINFO</keyword>
+      <keyword>CMAKE_\w+_FLAGS_RELWITHDEBINFO_INIT</keyword>
+      <keyword>CMAKE_\w+_GHS_KERNEL_FLAGS_DEBUG</keyword>
+      <keyword>CMAKE_\w+_GHS_KERNEL_FLAGS_MINSIZEREL</keyword>
+      <keyword>CMAKE_\w+_GHS_KERNEL_FLAGS_RELEASE</keyword>
+      <keyword>CMAKE_\w+_GHS_KERNEL_FLAGS_RELWITHDEBINFO</keyword>
       <keyword>CMAKE_\w+_IGNORE_EXTENSIONS</keyword>
       <keyword>CMAKE_\w+_IMPLICIT_INCLUDE_DIRECTORIES</keyword>
       <keyword>CMAKE_\w+_IMPLICIT_LINK_DIRECTORIES</keyword>
       <keyword>CMAKE_\w+_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES</keyword>
       <keyword>CMAKE_\w+_IMPLICIT_LINK_LIBRARIES</keyword>
+      <keyword>CMAKE_\w+_INCLUDE_WHAT_YOU_USE</keyword>
       <keyword>CMAKE_\w+_LIBRARY_ARCHITECTURE</keyword>
       <keyword>CMAKE_\w+_LINKER_PREFERENCE</keyword>
       <keyword>CMAKE_\w+_LINKER_PREFERENCE_PROPAGATES</keyword>
@@ -194,27 +237,58 @@
       <keyword>CMAKE_\w+_SIMULATE_VERSION</keyword>
       <keyword>CMAKE_\w+_SIZEOF_DATA_PTR</keyword>
       <keyword>CMAKE_\w+_SOURCE_FILE_EXTENSIONS</keyword>
+      <keyword>CMAKE_\w+_STANDARD_INCLUDE_DIRECTORIES</keyword>
+      <keyword>CMAKE_\w+_STANDARD_LIBRARIES</keyword>
       <keyword>CMAKE_\w+_VISIBILITY_PRESET</keyword>
       <keyword>CMAKE_ABSOLUTE_DESTINATION_FILES</keyword>
+      <keyword>CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS</keyword>
       <keyword>CMAKE_ANDROID_API</keyword>
       <keyword>CMAKE_ANDROID_API_MIN</keyword>
+      <keyword>CMAKE_ANDROID_ARCH</keyword>
+      <keyword>CMAKE_ANDROID_ARCH_ABI</keyword>
+      <keyword>CMAKE_ANDROID_ARM_MODE</keyword>
+      <keyword>CMAKE_ANDROID_ARM_NEON</keyword>
+      <keyword>CMAKE_ANDROID_ASSETS_DIRECTORIES</keyword>
       <keyword>CMAKE_ANDROID_GUI</keyword>
+      <keyword>CMAKE_ANDROID_JAR_DEPENDENCIES</keyword>
+      <keyword>CMAKE_ANDROID_JAR_DIRECTORIES</keyword>
+      <keyword>CMAKE_ANDROID_JAVA_SOURCE_DIR</keyword>
+      <keyword>CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES</keyword>
+      <keyword>CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES</keyword>
+      <keyword>CMAKE_ANDROID_NDK</keyword>
+      <keyword>CMAKE_ANDROID_NDK_DEPRECATED_HEADERS</keyword>
+      <keyword>CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG</keyword>
+      <keyword>CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION</keyword>
+      <keyword>CMAKE_ANDROID_PROCESS_MAX</keyword>
+      <keyword>CMAKE_ANDROID_PROGUARD</keyword>
+      <keyword>CMAKE_ANDROID_PROGUARD_CONFIG_PATH</keyword>
+      <keyword>CMAKE_ANDROID_SECURE_PROPS_PATH</keyword>
+      <keyword>CMAKE_ANDROID_SKIP_ANT_STEP</keyword>
+      <keyword>CMAKE_ANDROID_STANDALONE_TOOLCHAIN</keyword>
+      <keyword>CMAKE_ANDROID_STL_TYPE</keyword>
       <keyword>CMAKE_APPBUNDLE_PATH</keyword>
       <keyword>CMAKE_AR</keyword>
       <keyword>CMAKE_ARCHIVE_OUTPUT_DIRECTORY</keyword>
+      <keyword>CMAKE_ARCHIVE_OUTPUT_DIRECTORY_\w+</keyword>
       <keyword>CMAKE_ARGC</keyword>
       <keyword>CMAKE_ARGV0</keyword>
       <keyword>CMAKE_AUTOMOC</keyword>
+      <keyword>CMAKE_AUTOMOC_COMPILER_PREDEFINES</keyword>
+      <keyword>CMAKE_AUTOMOC_DEPEND_FILTERS</keyword>
+      <keyword>CMAKE_AUTOMOC_MACRO_NAMES</keyword>
       <keyword>CMAKE_AUTOMOC_MOC_OPTIONS</keyword>
       <keyword>CMAKE_AUTOMOC_RELAXED_MODE</keyword>
       <keyword>CMAKE_AUTORCC</keyword>
       <keyword>CMAKE_AUTORCC_OPTIONS</keyword>
       <keyword>CMAKE_AUTOUIC</keyword>
       <keyword>CMAKE_AUTOUIC_OPTIONS</keyword>
+      <keyword>CMAKE_AUTOUIC_SEARCH_PATHS</keyword>
       <keyword>CMAKE_BACKWARDS_COMPATIBILITY</keyword>
       <keyword>CMAKE_BINARY_DIR</keyword>
+      <keyword>CMAKE_BUILD_RPATH</keyword>
       <keyword>CMAKE_BUILD_TOOL</keyword>
       <keyword>CMAKE_BUILD_TYPE</keyword>
+      <keyword>CMAKE_BUILD_WITH_INSTALL_NAME_DIR</keyword>
       <keyword>CMAKE_BUILD_WITH_INSTALL_RPATH</keyword>
       <keyword>CMAKE_CACHEFILE_DIR</keyword>
       <keyword>CMAKE_CACHE_MAJOR_VERSION</keyword>
@@ -222,15 +296,25 @@
       <keyword>CMAKE_CACHE_PATCH_VERSION</keyword>
       <keyword>CMAKE_CFG_INTDIR</keyword>
       <keyword>CMAKE_CL_64</keyword>
+      <keyword>CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES</keyword>
+      <keyword>CMAKE_CODELITE_USE_TARGETS</keyword>
       <keyword>CMAKE_COLOR_MAKEFILE</keyword>
       <keyword>CMAKE_COMMAND</keyword>
       <keyword>CMAKE_COMPILER_2005</keyword>
-      <keyword>CMAKE_COMPILER_IS_GNU\w+</keyword>
+      <keyword>CMAKE_COMPILER_IS_GNUCC</keyword>
+      <keyword>CMAKE_COMPILER_IS_GNUCXX</keyword>
+      <keyword>CMAKE_COMPILER_IS_GNUG77</keyword>
       <keyword>CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY</keyword>
       <keyword>CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_\w+</keyword>
       <keyword>CMAKE_CONFIGURATION_TYPES</keyword>
       <keyword>CMAKE_CROSSCOMPILING</keyword>
+      <keyword>CMAKE_CROSSCOMPILING_EMULATOR</keyword>
       <keyword>CMAKE_CTEST_COMMAND</keyword>
+      <keyword>CMAKE_CUDA_EXTENSIONS</keyword>
+      <keyword>CMAKE_CUDA_HOST_COMPILER</keyword>
+      <keyword>CMAKE_CUDA_STANDARD</keyword>
+      <keyword>CMAKE_CUDA_STANDARD_REQUIRED</keyword>
+      <keyword>CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES</keyword>
       <keyword>CMAKE_CURRENT_BINARY_DIR</keyword>
       <keyword>CMAKE_CURRENT_LIST_DIR</keyword>
       <keyword>CMAKE_CURRENT_LIST_FILE</keyword>
@@ -246,23 +330,38 @@
       <keyword>CMAKE_C_STANDARD_REQUIRED</keyword>
       <keyword>CMAKE_DEBUG_POSTFIX</keyword>
       <keyword>CMAKE_DEBUG_TARGET_PROPERTIES</keyword>
+      <keyword>CMAKE_DEPENDS_IN_PROJECT_ONLY</keyword>
+      <keyword>CMAKE_DIRECTORY_LABELS</keyword>
       <keyword>CMAKE_DISABLE_FIND_PACKAGE_\w+</keyword>
       <keyword>CMAKE_DL_LIBS</keyword>
+      <keyword>CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES</keyword>
+      <keyword>CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT</keyword>
+      <keyword>CMAKE_ECLIPSE_MAKE_ARGUMENTS</keyword>
+      <keyword>CMAKE_ECLIPSE_VERSION</keyword>
       <keyword>CMAKE_EDIT_COMMAND</keyword>
+      <keyword>CMAKE_ENABLE_EXPORTS</keyword>
       <keyword>CMAKE_ERROR_DEPRECATED</keyword>
       <keyword>CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION</keyword>
       <keyword>CMAKE_EXECUTABLE_SUFFIX</keyword>
       <keyword>CMAKE_EXE_LINKER_FLAGS</keyword>
       <keyword>CMAKE_EXE_LINKER_FLAGS_\w+</keyword>
+      <keyword>CMAKE_EXE_LINKER_FLAGS_\w+_INIT</keyword>
+      <keyword>CMAKE_EXE_LINKER_FLAGS_INIT</keyword>
+      <keyword>CMAKE_EXPORT_COMPILE_COMMANDS</keyword>
       <keyword>CMAKE_EXPORT_NO_PACKAGE_REGISTRY</keyword>
       <keyword>CMAKE_EXTRA_GENERATOR</keyword>
       <keyword>CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES</keyword>
+      <keyword>CMAKE_FIND_APPBUNDLE</keyword>
+      <keyword>CMAKE_FIND_FRAMEWORK</keyword>
+      <keyword>CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX</keyword>
       <keyword>CMAKE_FIND_LIBRARY_PREFIXES</keyword>
       <keyword>CMAKE_FIND_LIBRARY_SUFFIXES</keyword>
       <keyword>CMAKE_FIND_NO_INSTALL_PREFIX</keyword>
       <keyword>CMAKE_FIND_PACKAGE_NAME</keyword>
       <keyword>CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY</keyword>
       <keyword>CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY</keyword>
+      <keyword>CMAKE_FIND_PACKAGE_SORT_DIRECTION</keyword>
+      <keyword>CMAKE_FIND_PACKAGE_SORT_ORDER</keyword>
       <keyword>CMAKE_FIND_PACKAGE_WARN_NO_MODULE</keyword>
       <keyword>CMAKE_FIND_ROOT_PATH</keyword>
       <keyword>CMAKE_FIND_ROOT_PATH_MODE_INCLUDE</keyword>
@@ -281,6 +380,7 @@
       <keyword>CMAKE_GNUtoMS</keyword>
       <keyword>CMAKE_HOME_DIRECTORY</keyword>
       <keyword>CMAKE_HOST_APPLE</keyword>
+      <keyword>CMAKE_HOST_SOLARIS</keyword>
       <keyword>CMAKE_HOST_SYSTEM</keyword>
       <keyword>CMAKE_HOST_SYSTEM_NAME</keyword>
       <keyword>CMAKE_HOST_SYSTEM_PROCESSOR</keyword>
@@ -299,14 +399,19 @@
       <keyword>CMAKE_INSTALL_MESSAGE</keyword>
       <keyword>CMAKE_INSTALL_NAME_DIR</keyword>
       <keyword>CMAKE_INSTALL_PREFIX</keyword>
+      <keyword>CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT</keyword>
       <keyword>CMAKE_INSTALL_RPATH</keyword>
       <keyword>CMAKE_INSTALL_RPATH_USE_LINK_PATH</keyword>
       <keyword>CMAKE_INTERNAL_PLATFORM_ABI</keyword>
+      <keyword>CMAKE_INTERPROCEDURAL_OPTIMIZATION</keyword>
+      <keyword>CMAKE_INTERPROCEDURAL_OPTIMIZATION_\w+</keyword>
+      <keyword>CMAKE_IOS_INSTALL_COMBINED</keyword>
       <keyword>CMAKE_JOB_POOL_COMPILE</keyword>
       <keyword>CMAKE_JOB_POOL_LINK</keyword>
       <keyword>CMAKE_LIBRARY_ARCHITECTURE</keyword>
       <keyword>CMAKE_LIBRARY_ARCHITECTURE_REGEX</keyword>
       <keyword>CMAKE_LIBRARY_OUTPUT_DIRECTORY</keyword>
+      <keyword>CMAKE_LIBRARY_OUTPUT_DIRECTORY_\w+</keyword>
       <keyword>CMAKE_LIBRARY_PATH</keyword>
       <keyword>CMAKE_LIBRARY_PATH_FLAG</keyword>
       <keyword>CMAKE_LINK_DEF_FILE_FLAG</keyword>
@@ -315,18 +420,26 @@
       <keyword>CMAKE_LINK_LIBRARY_FILE_FLAG</keyword>
       <keyword>CMAKE_LINK_LIBRARY_FLAG</keyword>
       <keyword>CMAKE_LINK_LIBRARY_SUFFIX</keyword>
+      <keyword>CMAKE_LINK_SEARCH_END_STATIC</keyword>
+      <keyword>CMAKE_LINK_SEARCH_START_STATIC</keyword>
+      <keyword>CMAKE_LINK_WHAT_YOU_USE</keyword>
       <keyword>CMAKE_MACOSX_BUNDLE</keyword>
       <keyword>CMAKE_MACOSX_RPATH</keyword>
       <keyword>CMAKE_MAJOR_VERSION</keyword>
       <keyword>CMAKE_MAKE_PROGRAM</keyword>
       <keyword>CMAKE_MAP_IMPORTED_CONFIG_\w+</keyword>
+      <keyword>CMAKE_MATCH_\d+</keyword>
       <keyword>CMAKE_MATCH_COUNT</keyword>
       <keyword>CMAKE_MFC_FLAG</keyword>
       <keyword>CMAKE_MINIMUM_REQUIRED_VERSION</keyword>
       <keyword>CMAKE_MINOR_VERSION</keyword>
       <keyword>CMAKE_MODULE_LINKER_FLAGS</keyword>
       <keyword>CMAKE_MODULE_LINKER_FLAGS_\w+</keyword>
+      <keyword>CMAKE_MODULE_LINKER_FLAGS_\w+_INIT</keyword>
+      <keyword>CMAKE_MODULE_LINKER_FLAGS_INIT</keyword>
       <keyword>CMAKE_MODULE_PATH</keyword>
+      <keyword>CMAKE_MSVCIDE_RUN_PATH</keyword>
+      <keyword>CMAKE_NINJA_OUTPUT_PATH_PREFIX</keyword>
       <keyword>CMAKE_NOT_USING_CONFIG_FLAGS</keyword>
       <keyword>CMAKE_NO_BUILTIN_CHRPATH</keyword>
       <keyword>CMAKE_NO_SYSTEM_FROM_IMPORTED</keyword>
@@ -344,15 +457,19 @@
       <keyword>CMAKE_PREFIX_PATH</keyword>
       <keyword>CMAKE_PROGRAM_PATH</keyword>
       <keyword>CMAKE_PROJECT_\w+_INCLUDE</keyword>
+      <keyword>CMAKE_PROJECT_DESCRIPTION</keyword>
       <keyword>CMAKE_PROJECT_NAME</keyword>
       <keyword>CMAKE_RANLIB</keyword>
       <keyword>CMAKE_ROOT</keyword>
       <keyword>CMAKE_RUNTIME_OUTPUT_DIRECTORY</keyword>
+      <keyword>CMAKE_RUNTIME_OUTPUT_DIRECTORY_\w+</keyword>
       <keyword>CMAKE_SCRIPT_MODE_FILE</keyword>
       <keyword>CMAKE_SHARED_LIBRARY_PREFIX</keyword>
       <keyword>CMAKE_SHARED_LIBRARY_SUFFIX</keyword>
       <keyword>CMAKE_SHARED_LINKER_FLAGS</keyword>
       <keyword>CMAKE_SHARED_LINKER_FLAGS_\w+</keyword>
+      <keyword>CMAKE_SHARED_LINKER_FLAGS_\w+_INIT</keyword>
+      <keyword>CMAKE_SHARED_LINKER_FLAGS_INIT</keyword>
       <keyword>CMAKE_SHARED_MODULE_PREFIX</keyword>
       <keyword>CMAKE_SHARED_MODULE_SUFFIX</keyword>
       <keyword>CMAKE_SIZEOF_VOID_P</keyword>
@@ -363,13 +480,20 @@
       <keyword>CMAKE_SKIP_RPATH</keyword>
       <keyword>CMAKE_SOURCE_DIR</keyword>
       <keyword>CMAKE_STAGING_PREFIX</keyword>
-      <keyword>CMAKE_STANDARD_LIBRARIES</keyword>
       <keyword>CMAKE_STATIC_LIBRARY_PREFIX</keyword>
       <keyword>CMAKE_STATIC_LIBRARY_SUFFIX</keyword>
       <keyword>CMAKE_STATIC_LINKER_FLAGS</keyword>
       <keyword>CMAKE_STATIC_LINKER_FLAGS_\w+</keyword>
+      <keyword>CMAKE_STATIC_LINKER_FLAGS_\w+_INIT</keyword>
+      <keyword>CMAKE_STATIC_LINKER_FLAGS_INIT</keyword>
+      <keyword>CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS</keyword>
+      <keyword>CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE</keyword>
       <keyword>CMAKE_SYSROOT</keyword>
+      <keyword>CMAKE_SYSROOT_COMPILE</keyword>
+      <keyword>CMAKE_SYSROOT_LINK</keyword>
       <keyword>CMAKE_SYSTEM</keyword>
+      <keyword>CMAKE_SYSTEM_APPBUNDLE_PATH</keyword>
+      <keyword>CMAKE_SYSTEM_FRAMEWORK_PATH</keyword>
       <keyword>CMAKE_SYSTEM_IGNORE_PATH</keyword>
       <keyword>CMAKE_SYSTEM_INCLUDE_PATH</keyword>
       <keyword>CMAKE_SYSTEM_LIBRARY_PATH</keyword>
@@ -378,8 +502,11 @@
       <keyword>CMAKE_SYSTEM_PROCESSOR</keyword>
       <keyword>CMAKE_SYSTEM_PROGRAM_PATH</keyword>
       <keyword>CMAKE_SYSTEM_VERSION</keyword>
+      <keyword>CMAKE_Swift_LANGUAGE_VERSION</keyword>
       <keyword>CMAKE_TOOLCHAIN_FILE</keyword>
       <keyword>CMAKE_TRY_COMPILE_CONFIGURATION</keyword>
+      <keyword>CMAKE_TRY_COMPILE_PLATFORM_VARIABLES</keyword>
+      <keyword>CMAKE_TRY_COMPILE_TARGET_TYPE</keyword>
       <keyword>CMAKE_TWEAK_VERSION</keyword>
       <keyword>CMAKE_USER_MAKE_RULES_OVERRIDE</keyword>
       <keyword>CMAKE_USER_MAKE_RULES_OVERRIDE_\w+</keyword>
@@ -388,19 +515,103 @@
       <keyword>CMAKE_VERSION</keyword>
       <keyword>CMAKE_VISIBILITY_INLINES_HIDDEN</keyword>
       <keyword>CMAKE_VS_DEVENV_COMMAND</keyword>
+      <keyword>CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD</keyword>
+      <keyword>CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD</keyword>
       <keyword>CMAKE_VS_INTEL_Fortran_PROJECT_VERSION</keyword>
       <keyword>CMAKE_VS_MSBUILD_COMMAND</keyword>
-      <keyword>CMAKE_VS_MSDEV_COMMAND</keyword>
       <keyword>CMAKE_VS_NsightTegra_VERSION</keyword>
       <keyword>CMAKE_VS_PLATFORM_NAME</keyword>
       <keyword>CMAKE_VS_PLATFORM_TOOLSET</keyword>
+      <keyword>CMAKE_VS_PLATFORM_TOOLSET_CUDA</keyword>
+      <keyword>CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE</keyword>
+      <keyword>CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION</keyword>
       <keyword>CMAKE_WARN_DEPRECATED</keyword>
       <keyword>CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION</keyword>
       <keyword>CMAKE_WIN32_EXECUTABLE</keyword>
+      <keyword>CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS</keyword>
       <keyword>CMAKE_XCODE_ATTRIBUTE_\w+</keyword>
+      <keyword>CMAKE_XCODE_GENERATE_SCHEME</keyword>
       <keyword>CMAKE_XCODE_PLATFORM_TOOLSET</keyword>
+      <keyword>CPACK_ABSOLUTE_DESTINATION_FILES</keyword>
+      <keyword>CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY</keyword>
+      <keyword>CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION</keyword>
+      <keyword>CPACK_INCLUDE_TOPLEVEL_DIRECTORY</keyword>
+      <keyword>CPACK_INSTALL_SCRIPT</keyword>
+      <keyword>CPACK_PACKAGING_INSTALL_PREFIX</keyword>
+      <keyword>CPACK_SET_DESTDIR</keyword>
+      <keyword>CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION</keyword>
+      <keyword>CTEST_BINARY_DIRECTORY</keyword>
+      <keyword>CTEST_BUILD_COMMAND</keyword>
+      <keyword>CTEST_BUILD_NAME</keyword>
+      <keyword>CTEST_BZR_COMMAND</keyword>
+      <keyword>CTEST_BZR_UPDATE_OPTIONS</keyword>
+      <keyword>CTEST_CHANGE_ID</keyword>
+      <keyword>CTEST_CHECKOUT_COMMAND</keyword>
+      <keyword>CTEST_CONFIGURATION_TYPE</keyword>
+      <keyword>CTEST_CONFIGURE_COMMAND</keyword>
+      <keyword>CTEST_COVERAGE_COMMAND</keyword>
+      <keyword>CTEST_COVERAGE_EXTRA_FLAGS</keyword>
+      <keyword>CTEST_CURL_OPTIONS</keyword>
+      <keyword>CTEST_CUSTOM_COVERAGE_EXCLUDE</keyword>
+      <keyword>CTEST_CUSTOM_ERROR_EXCEPTION</keyword>
+      <keyword>CTEST_CUSTOM_ERROR_MATCH</keyword>
+      <keyword>CTEST_CUSTOM_ERROR_POST_CONTEXT</keyword>
+      <keyword>CTEST_CUSTOM_ERROR_PRE_CONTEXT</keyword>
+      <keyword>CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE</keyword>
+      <keyword>CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS</keyword>
+      <keyword>CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS</keyword>
+      <keyword>CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE</keyword>
+      <keyword>CTEST_CUSTOM_MEMCHECK_IGNORE</keyword>
+      <keyword>CTEST_CUSTOM_POST_MEMCHECK</keyword>
+      <keyword>CTEST_CUSTOM_POST_TEST</keyword>
+      <keyword>CTEST_CUSTOM_PRE_MEMCHECK</keyword>
+      <keyword>CTEST_CUSTOM_PRE_TEST</keyword>
+      <keyword>CTEST_CUSTOM_TEST_IGNORE</keyword>
+      <keyword>CTEST_CUSTOM_WARNING_EXCEPTION</keyword>
+      <keyword>CTEST_CUSTOM_WARNING_MATCH</keyword>
+      <keyword>CTEST_CVS_CHECKOUT</keyword>
+      <keyword>CTEST_CVS_COMMAND</keyword>
+      <keyword>CTEST_CVS_UPDATE_OPTIONS</keyword>
+      <keyword>CTEST_DROP_LOCATION</keyword>
+      <keyword>CTEST_DROP_METHOD</keyword>
+      <keyword>CTEST_DROP_SITE</keyword>
+      <keyword>CTEST_DROP_SITE_CDASH</keyword>
+      <keyword>CTEST_DROP_SITE_PASSWORD</keyword>
+      <keyword>CTEST_DROP_SITE_USER</keyword>
+      <keyword>CTEST_EXTRA_COVERAGE_GLOB</keyword>
+      <keyword>CTEST_GIT_COMMAND</keyword>
+      <keyword>CTEST_GIT_INIT_SUBMODULES</keyword>
+      <keyword>CTEST_GIT_UPDATE_CUSTOM</keyword>
+      <keyword>CTEST_GIT_UPDATE_OPTIONS</keyword>
+      <keyword>CTEST_HG_COMMAND</keyword>
+      <keyword>CTEST_HG_UPDATE_OPTIONS</keyword>
+      <keyword>CTEST_LABELS_FOR_SUBPROJECTS</keyword>
+      <keyword>CTEST_MEMORYCHECK_COMMAND</keyword>
+      <keyword>CTEST_MEMORYCHECK_COMMAND_OPTIONS</keyword>
+      <keyword>CTEST_MEMORYCHECK_SANITIZER_OPTIONS</keyword>
+      <keyword>CTEST_MEMORYCHECK_SUPPRESSIONS_FILE</keyword>
+      <keyword>CTEST_MEMORYCHECK_TYPE</keyword>
+      <keyword>CTEST_NIGHTLY_START_TIME</keyword>
+      <keyword>CTEST_P4_CLIENT</keyword>
+      <keyword>CTEST_P4_COMMAND</keyword>
+      <keyword>CTEST_P4_OPTIONS</keyword>
+      <keyword>CTEST_P4_UPDATE_OPTIONS</keyword>
+      <keyword>CTEST_SCP_COMMAND</keyword>
+      <keyword>CTEST_SITE</keyword>
+      <keyword>CTEST_SOURCE_DIRECTORY</keyword>
+      <keyword>CTEST_SVN_COMMAND</keyword>
+      <keyword>CTEST_SVN_OPTIONS</keyword>
+      <keyword>CTEST_SVN_UPDATE_OPTIONS</keyword>
+      <keyword>CTEST_TEST_LOAD</keyword>
+      <keyword>CTEST_TEST_TIMEOUT</keyword>
+      <keyword>CTEST_TRIGGER_SITE</keyword>
+      <keyword>CTEST_UPDATE_COMMAND</keyword>
+      <keyword>CTEST_UPDATE_OPTIONS</keyword>
+      <keyword>CTEST_UPDATE_VERSION_ONLY</keyword>
+      <keyword>CTEST_USE_LAUNCHERS</keyword>
       <keyword>CYGWIN</keyword>
       <keyword>EXECUTABLE_OUTPUT_PATH</keyword>
+      <keyword>GHS-MULTI</keyword>
       <keyword>LIBRARY_OUTPUT_PATH</keyword>
       <keyword>MINGW</keyword>
       <keyword>MSVC</keyword>
@@ -416,6 +627,7 @@
       <keyword>MSVC_IDE</keyword>
       <keyword>MSVC_VERSION</keyword>
       <keyword>PROJECT_BINARY_DIR</keyword>
+      <keyword>PROJECT_DESCRIPTION</keyword>
       <keyword>PROJECT_NAME</keyword>
       <keyword>PROJECT_SOURCE_DIR</keyword>
       <keyword>PROJECT_VERSION</keyword>
@@ -428,19 +640,14 @@
       <keyword>WINCE</keyword>
       <keyword>WINDOWS_PHONE</keyword>
       <keyword>WINDOWS_STORE</keyword>
+      <keyword>XCODE</keyword>
       <keyword>XCODE_VERSION</keyword>
     </context>
 
-    <context id="builtin-variable-2" style-ref="builtin-variable">
-      <keyword>LOCATION</keyword>
-      <keyword>TARGET</keyword>
-      <keyword>POST_BUILD</keyword>
-      <keyword>PRE_BUILD</keyword>
-      <keyword>ARGS</keyword>
-    </context>
-
     <context id="operator" style-ref="operator">
       <keyword>AND</keyword>
+      <keyword>BOOL</keyword>
+      <keyword>CACHE</keyword>
       <keyword>COMMAND</keyword>
       <keyword>DEFINED</keyword>
       <keyword>DOC</keyword>
@@ -483,39 +690,126 @@
       <keyword>WHILE</keyword>
     </context>
 
-    <context id="variable" style-ref="variable"
+    <context id="escape-sequence">
+      <match>(\\([trn;]|[^A-Za-z0-9;]))|(\\(.|$))</match>
+      <include>
+        <context sub-pattern="1" style-ref="def:special-char"/>
+        <context sub-pattern="3" style-ref="def:error"/>
+      </include>
+    </context>
+
+    <context id="disallowed-variable-reference-char" style-ref="def:error" extend-parent="false">
+      <match>[^A-Za-z0-9_./+-]</match>
+    </context>
+
+    <context id="variable-reference" style-ref="variable"
              style-inside="true" end-at-line-end="true"
     >
       <start>\$\{</start>
       <end>\}</end>
       <include>
+        <context sub-pattern="0" where="start" style-ref="def:special-char"/>
+        <context sub-pattern="0" where="end" style-ref="def:special-char"/>
         <context ref="builtin-variable"/>
-        <context ref="builtin-variable-2"/>
+        <context ref="variable-reference"/>
+        <context ref="env-variable-reference"/>
+        <context ref="escape-sequence"/>
+        <context ref="disallowed-variable-reference-char"/>
+      </include>
+    </context>
+
+    <context id="env-variable-reference" style-ref="variable"
+             style-inside="true" end-at-line-end="true">
+      <start>\$ENV\{</start>
+      <end>\}</end>
+      <include>
+        <context sub-pattern="0" where="start" style-ref="def:special-char"/>
+        <context sub-pattern="0" where="end" style-ref="def:special-char"/>
+        <context ref="variable-reference"/>
+        <context ref="env-variable-reference"/>
+        <context ref="escape-sequence"/>
+        <context ref="disallowed-variable-reference-char"/>
+      </include>
+    </context>
+
+    <context id="quoted-argument" style-ref="quoted-argument">
+      <start>(?&lt;=[()"]|\s|^)"</start>
+      <end>"</end>
+      <include>
+        <context ref="variable-reference"/>
+        <context ref="env-variable-reference"/>
+        <context style-ref="def:special-char">
+          <match>\\$</match> <!-- quoted_continuation from the grammar -->
+        </context>
+        <context ref="escape-sequence"/>
+      </include>
+    </context>
+
+    <context id="bracket-argument" style-ref="bracket-argument">
+      <start>\[(=*)\[</start>
+      <end>\]\%{1@start}\]</end>
+    </context>
+
+    <context id="bracket-comment" style-ref="def:comment" class="comment" class-disabled="no-spell-check">
+      <start>#\[(=*)\[</start>
+      <end>\]\%{1@start}\]</end>
+      <include>
+        <context ref="def:in-comment"/>
+      </include>
+    </context>
+
+    <context id="in-unquoted-argument">
+      <include>
+        <context ref="constant"/>
+        <context ref="variable-reference"/>
+        <context ref="env-variable-reference"/>
+        <context ref="escape-sequence"/>
+        <context style-ref="legacy-syntax" end-at-line-end="true">
+          <start>"</start>
+          <end>"</end>
+          <include>
+            <context ref="escape-sequence"/>
+          </include>
+        </context>
+        <context style-ref="legacy-syntax">
+          <match>\$\(\w+\)</match>
+        </context>
+      </include>
+    </context>
+
+    <context id="arguments">
+      <start>\(</start>
+      <end>\)</end>
+      <include>
+        <context ref="quoted-argument"/>
+        <context ref="bracket-argument"/>
+        <context ref="in-unquoted-argument"/>
+        <context ref="operator"/>
+        <context ref="arguments"/>
+        <context ref="bracket-comment"/>
+        <context ref="def:shell-like-comment"/>
       </include>
     </context>
 
     <context id="variable-assignment">
-      <start>\b((?i)SET)\b\s*\(\s*([\w_][\w\d_]*)</start>
+      <start>\b((?i)SET|UNSET)\b\s*\(\s*([\w_][\w\d_]*)</start>
       <end>\)</end>
       <include>
         <context sub-pattern="1" where="start" style-ref="builtin-command"/>
         <context sub-pattern="2" where="start" style-ref="variable"/>
-        <context ref="variable"/>
-        <context ref="constant"/>
-        <context ref="def:shell-like-comment"/>
+        <context ref="arguments:*"/>
       </include>
     </context>
 
     <context id="cmake">
       <include>
-        <context ref="variable"/>
         <context ref="variable-assignment"/>
-        <context ref="def:shell-like-comment"/>
-        <context ref="constant"/>
         <context ref="builtin-command"/>
         <context ref="deprecated-builtin-command"/>
-        <context ref="operator"/>
         <context ref="control"/>
+        <context ref="arguments"/>
+        <context ref="bracket-comment"/>
+        <context ref="def:shell-like-comment"/>
       </include>
     </context>
 
diff --git a/data/language-specs/cobol.lang b/data/language-specs/cobol.lang
index 88ef516..543545e 100644
--- a/data/language-specs/cobol.lang
+++ b/data/language-specs/cobol.lang
@@ -19,12 +19,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="cobol" _name="COBOL" version="2.0" _section="Source">
+<language id="cobol" name="COBOL" version="2.0" _section="Source">
   <metadata>
     <property name="mimetype">text/x-cobol</property>
     <property name="globs">*.cbl;*.cob;*.cbd;*.cdb;*.cdc</property>
@@ -32,15 +31,15 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"           map-to="def:comment"/>
-    <style id="statement"         _name="Statement"         map-to="def:statement"/>
-    <style id="variable"          _name="Variable"          map-to="def:type"/>
-    <style id="keyword"           _name="Keyword"           map-to="def:keyword"/>
-    <style id="constant"          _name="Constant"          map-to="def:constant"/>
-    <style id="string"            _name="String"            map-to="def:string"/>
-    <style id="number"            _name="Number"            map-to="def:decimal"/>
-    <style id="operator"          _name="Operator"          map-to="def:operator"/>
-    <style id="error"             _name="Error"             map-to="def:error"/>
+    <style id="comment"           name="Comment"           map-to="def:comment"/>
+    <style id="statement"         name="Statement"         map-to="def:statement"/>
+    <style id="variable"          name="Variable"          map-to="def:type"/>
+    <style id="keyword"           name="Keyword"           map-to="def:keyword"/>
+    <style id="constant"          name="Constant"          map-to="def:constant"/>
+    <style id="string"            name="String"            map-to="def:string"/>
+    <style id="number"            name="Number"            map-to="def:decimal"/>
+    <style id="operator"          name="Operator"          map-to="def:operator"/>
+    <style id="error"             name="Error"             map-to="def:error"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/cpp.lang b/data/language-specs/cpp.lang
index 9737357..2b2ddbc 100644
--- a/data/language-specs/cpp.lang
+++ b/data/language-specs/cpp.lang
@@ -17,12 +17,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="cpp" _name="C++" version="2.0" _section="Source">
+<language id="cpp" name="C++" version="2.0" _section="Source">
     <metadata>
       <property name="mimetypes">text/x-c++;text/x-cpp;text/x-c++src</property>
       <property name="globs">*.cpp;*.cxx;*.cc;*.C;*.c++</property>
@@ -32,9 +31,9 @@
     </metadata>
 
     <styles>
-        <style id="keyword" _name="Keyword" map-to="c:keyword"/>
-        <style id="type" _name="Data Type" map-to="c:type"/>
-        <style id="common-defines" _name="Common Defines" map-to="c:common-defines"/>
+        <style id="keyword" name="Keyword" map-to="c:keyword"/>
+        <style id="type" name="Data Type" map-to="c:type"/>
+        <style id="common-defines" name="Common Defines" map-to="c:common-defines"/>
     </styles>
 
     <definitions>
diff --git a/data/language-specs/cpphdr.lang b/data/language-specs/cpphdr.lang
index f4944a6..519846b 100644
--- a/data/language-specs/cpphdr.lang
+++ b/data/language-specs/cpphdr.lang
@@ -17,9 +17,8 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 <language id="cpphdr" _name="C++ Header" version="2.0" _section="Source">
diff --git a/data/language-specs/csharp.lang b/data/language-specs/csharp.lang
index 5cd2e8d..9ec22f6 100644
--- a/data/language-specs/csharp.lang
+++ b/data/language-specs/csharp.lang
@@ -19,12 +19,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="c-sharp" _name="C#" version="2.0" _section="Source">
+<language id="c-sharp" name="C#" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-csharpsrc;text/x-csharp</property>
     <property name="globs">*.cs</property>
@@ -34,21 +33,20 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="char" _name="Character" map-to="def:character"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
-    <!-- Translators: this is a format that appears in the strings -->
-    <style id="format" _name="String Format" map-to="def:special-char"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="hexadecimal" _name="Hexadecimal number" map-to="def:base-n-integer"/>
-    <style id="real" _name="Real number" map-to="def:floating-point"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="char" name="Character" map-to="def:character"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
+    <style id="format" name="String Format" map-to="def:special-char"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="null-value" name="Null Value" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="hexadecimal" name="Hexadecimal number" map-to="def:base-n-integer"/>
+    <style id="real" name="Real number" map-to="def:floating-point"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/css.lang b/data/language-specs/css.lang
index e6b8f23..f191d34 100644
--- a/data/language-specs/css.lang
+++ b/data/language-specs/css.lang
@@ -18,9 +18,8 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 <!--
@@ -36,7 +35,7 @@
 
         Converted to new format with convert.py
 -->
-<language id="css" _name="CSS" version="2.0" _section="Other">
+<language id="css" name="CSS" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/css</property>
     <property name="globs">*.css;*.CSSL</property>
@@ -45,21 +44,20 @@
   </metadata>
 
   <styles>
-    <style id="error"                 _name="Error"                 map-to="def:error"/>
-    <style id="others-2"              _name="Others 2"/>
-    <style id="string"                _name="String"                map-to="def:string"/>
-    <style id="color"                 _name="Color"                 map-to="def:base-n-integer"/>
-    <style id="others-3"              _name="Others 3"/>
-    <style id="function"              _name="Function"              map-to="def:function"/>
-    <!-- Translator: it is a type of number -->
-    <style id="decimal"               _name="Decimal"               map-to="def:decimal"/>
-    <style id="dimension"             _name="Dimension"             map-to="def:floating-point"/>
-    <style id="property-values"       _name="Property Value"        map-to="def:constant"/>
-    <style id="at-rules"              _name="at-rules"              map-to="def:preprocessor"/>
-    <style id="keyword"               _name="Keyword"               map-to="def:keyword"/>
-    <style id="selector-id"           _name="ID Selector"           map-to="def:statement"/>
-    <style id="selector-class"        _name="Class Selector"        map-to="def:identifier"/>
-    <style id="selector-tagname"      _name="Tag Name Selector"     map-to="def:type"/>
+    <style id="error"                 name="Error"                 map-to="def:error"/>
+    <style id="others-2"              name="Others 2"/>
+    <style id="string"                name="String"                map-to="def:string"/>
+    <style id="color"                 name="Color"                 map-to="def:base-n-integer"/>
+    <style id="others-3"              name="Others 3"/>
+    <style id="function"              name="Function"              map-to="def:function"/>
+    <style id="decimal"               name="Decimal"               map-to="def:decimal"/>
+    <style id="dimension"             name="Dimension"             map-to="def:floating-point"/>
+    <style id="property-values"       name="Property Value"        map-to="def:constant"/>
+    <style id="at-rules"              name="at-rules"              map-to="def:preprocessor"/>
+    <style id="keyword"               name="Keyword"               map-to="def:keyword"/>
+    <style id="selector-id"           name="ID Selector"           map-to="def:statement"/>
+    <style id="selector-class"        name="Class Selector"        map-to="def:identifier"/>
+    <style id="selector-tagname"      name="Tag Name Selector"     map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/csv.lang b/data/language-specs/csv.lang
index dcca0fb..55d0848 100644
--- a/data/language-specs/csv.lang
+++ b/data/language-specs/csv.lang
@@ -16,22 +16,21 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="csv" _name="CSV" version="2.0" _section="Other">
+<language id="csv" name="CSV" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/csv</property>
     <property name="globs">*.csv</property>
   </metadata>
 
   <styles>
-    <style id="decimal"           _name="Decimal number"        map-to="def:decimal"/>
-    <style id="escaped-character" _name="Escaped character"     map-to="def:special-char"/>
-    <style id="floating-point"    _name="Floating point number" map-to="def:floating-point"/>
-    <style id="string"            _name="String"                map-to="def:string"/>
+    <style id="decimal"           name="Decimal number"        map-to="def:decimal"/>
+    <style id="escaped-character" name="Escaped character"     map-to="def:special-char"/>
+    <style id="floating-point"    name="Floating point number" map-to="def:floating-point"/>
+    <style id="string"            name="String"                map-to="def:string"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/cuda.lang b/data/language-specs/cuda.lang
index 32f9c66..88c95e0 100644
--- a/data/language-specs/cuda.lang
+++ b/data/language-specs/cuda.lang
@@ -15,12 +15,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="cuda" _name="CUDA" version="2.0" _section="Source">
+<language id="cuda" name="CUDA" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.cu;*.cuh</property>
     <property name="line-comment-start">//</property>
@@ -30,11 +29,11 @@
 
 
   <styles>
-    <style id="keyword"       _name="Keyword"           map-to="def:keyword"/>
-    <style id="data-type"     _name="Data Type"         map-to="def:type"/>
-    <style id="cuda-global"   _name="Global Functions"  map-to="def:function"/>
-    <style id="cuda-device"   _name="Device Functions"  map-to="def:function"/>
-    <style id="global-var"    _name="Global Variables"  map-to="def:identifier"/>
+    <style id="keyword"       name="Keyword"           map-to="def:keyword"/>
+    <style id="data-type"     name="Data Type"         map-to="def:type"/>
+    <style id="cuda-global"   name="Global Functions"  map-to="def:function"/>
+    <style id="cuda-device"   name="Device Functions"  map-to="def:function"/>
+    <style id="global-var"    name="Global Variables"  map-to="def:identifier"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/d.lang b/data/language-specs/d.lang
index eecc944..be7887f 100644
--- a/data/language-specs/d.lang
+++ b/data/language-specs/d.lang
@@ -16,9 +16,8 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 <!--
@@ -27,7 +26,7 @@
        Reference:
                http://dlang.org/type.html
 -->
-<language id="d" _name="D" version="2.0" _section="Source">
+<language id="d" name="D" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-dsrc</property>
     <property name="globs">*.d</property>
@@ -37,19 +36,19 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="special-token" _name="Special Token" map-to="def:preprocessor"/>
-    <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean" map-to="def:boolean"/>
-    <style id="floating-point" _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="binary" _name="Binary number" map-to="def:base-n-integer"/>
-    <style id="octal" _name="Octal number" map-to="def:base-n-integer"/>
-    <style id="hexadecimal" _name="Hexadecimal number" map-to="def:base-n-integer"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="special-token" name="Special Token" map-to="def:preprocessor"/>
+    <style id="null-value" name="Null Value" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean" map-to="def:boolean"/>
+    <style id="floating-point" name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="binary" name="Binary number" map-to="def:base-n-integer"/>
+    <style id="octal" name="Octal number" map-to="def:base-n-integer"/>
+    <style id="hexadecimal" name="Hexadecimal number" map-to="def:base-n-integer"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/def.lang b/data/language-specs/def.lang
index 373fe14..4bd0c0c 100644
--- a/data/language-specs/def.lang
+++ b/data/language-specs/def.lang
@@ -17,12 +17,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="def" _name="Defaults" hidden="true" version="2.0">
+<language id="def" name="Defaults" hidden="true" version="2.0">
   <styles>
 
     <!-- styles defined here are all the styles that
@@ -37,85 +36,85 @@
 
     <!-- Comment group -->
     <!-- Any comment -->
-    <style id="comment"             _name="Comment"/>
+    <style id="comment"             name="Comment"/>
     <!-- A shebang: #!/bin/sh -->
-    <style id="shebang"             _name="Shebang"               map-to="def:comment"/>
+    <style id="shebang"             name="Shebang"               map-to="def:comment"/>
     <!-- A special comment containing documentation like in javadoc or
          gtk-doc -->
-    <style id="doc-comment"         _name="Documentation comment" map-to="def:comment"/>
+    <style id="doc-comment"         name="Documentation comment" map-to="def:comment"/>
     <!-- A element inside a documentation comment: @author -->
     <!-- This style doesn't map to anything since it must be used as an additional
          style for text which is already styled as a "doc-comment" -->
-    <style id="doc-comment-element" _name="Documentation comment element" />
+    <style id="doc-comment-element" name="Documentation comment element" />
 
     <!-- Constant group -->
     <!-- Any constant -->
-    <style id="constant"            _name="Constant"/>
+    <style id="constant"            name="Constant"/>
     <!-- A character constant: 'c' -->
-    <style id="character"           _name="Character"             map-to="def:constant"/>
+    <style id="character"           name="Character"             map-to="def:constant"/>
     <!-- A string constant: "this is a string" -->
-    <style id="string"              _name="String"                map-to="def:constant"/>
+    <style id="string"              name="String"                map-to="def:constant"/>
     <!-- Special character in a string constant: "%s", "\t" -->
     <!-- This style doesn't map to anything since it must be used as an additional
          style for text which is already styled as a "string" -->
-    <style id="special-char"        _name="Special character (inside a string)" />
+    <style id="special-char"        name="Special character (inside a string)" />
     <!-- A generic number constant -->
-    <style id="number"              _name="Number"                map-to="def:constant"/>
+    <style id="number"              name="Number"                map-to="def:constant"/>
     <!-- A floating point constant: 2.3e10 -->
-    <style id="floating-point"      _name="Floating point number" map-to="def:number"/>
+    <style id="floating-point"      name="Floating point number" map-to="def:number"/>
     <!-- A decimal number: 1234 -->
-    <style id="decimal"             _name="Decimal number"        map-to="def:number"/>
+    <style id="decimal"             name="Decimal number"        map-to="def:number"/>
     <!-- A base-N number: 0xFFFF -->
-    <style id="base-n-integer"      _name="Base-N number"         map-to="def:number"/>
+    <style id="base-n-integer"      name="Base-N number"         map-to="def:number"/>
     <!-- A complex number -->
-    <style id="complex"             _name="Complex number"        map-to="def:number"/>
+    <style id="complex"             name="Complex number"        map-to="def:number"/>
     <!-- A special constant like NULL in C or null in Java -->
-    <style id="special-constant"    _name="Special constant"      map-to="def:constant"/>
+    <style id="special-constant"    name="Special constant"      map-to="def:constant"/>
     <!-- A boolean constant: TRUE, false -->
-    <style id="boolean"             _name="Boolean value"         map-to="def:special-constant"/>
+    <style id="boolean"             name="Boolean value"         map-to="def:special-constant"/>
 
     <!-- Identifier group -->
     <!-- Any variable name -->
-    <style id="identifier"          _name="Identifier" />
+    <style id="identifier"          name="Identifier" />
     <!-- A function name (also: methods for classes) -->
-    <style id="function"            _name="Function" map-to="def:identifier"/>
+    <style id="function"            name="Function" map-to="def:identifier"/>
     <!-- A builtin name: like __import__, abs in Python
         (see http://docs.python.org/lib/built-in-funcs.html) -->
-    <style id="builtin"             _name="Built-in identifier" map-to="def:identifier"/>
+    <style id="builtin"             name="Built-in identifier" map-to="def:identifier"/>
 
     <!-- Statement group -->
     <!-- Any statement -->
-    <style id="statement"           _name="Statement"/>
+    <style id="statement"           name="Statement"/>
     <!-- Operators: "+", "*", etc. -->
-    <style id="operator"            _name="Operator" map-to="def:statement" />
+    <style id="operator"            name="Operator" map-to="def:statement" />
     <!-- keywords: "if", "for", "while", etc. -->
-    <style id="keyword"             _name="Keyword" map-to="def:statement" />
+    <style id="keyword"             name="Keyword" map-to="def:statement" />
 
     <!-- Type group -->
     <!--A primitive data type: int, long, char, etc. -->
-    <style id="type"                _name="Data type"/>
+    <style id="type"                name="Data type"/>
 
     <!-- Others -->
     <!-- This one is for '#include <foo.h>' and "#pragma blah", or 'use foobar', etc.. -->
-    <style id="preprocessor"        _name="Preprocessor directive"/>
+    <style id="preprocessor"        name="Preprocessor directive"/>
     <!-- Any erroneous construct -->
-    <style id="error"               _name="Error"/>
+    <style id="error"               name="Error"/>
     <!-- to mark possibily errors or unrecommended syntax  -->
-    <style id="warning"             _name="Warning"/>
+    <style id="warning"             name="Warning"/>
     <!--Reserved keywords: like "const" and "goto" in Java -->
-    <style id="reserved"            _name="Reserved keyword" map-to="def:error" />
+    <style id="reserved"            name="Reserved keyword" map-to="def:error" />
     <!-- Anything that needs extra attention; mostly the keywords TODO, FIXME and XXX -->
-    <style id="note"                _name="Note (FIXME, TODO, XXX, etc.)"/>
+    <style id="note"                name="Note (FIXME, TODO, XXX, etc.)"/>
     <!-- Text that stands out, HTML links, e-mail addresses, etc. -->
-    <style id="underlined"          _name="Underlined"/>
+    <style id="underlined"          name="Underlined"/>
     <!-- Text that acts as some kind of heading, such as h1, h2, ... in html. -->
-    <style id="heading0"            _name="Heading 0"/>
-    <style id="heading1"            _name="Heading 1"/>
-    <style id="heading2"            _name="Heading 2"/>
-    <style id="heading3"            _name="Heading 3"/>
-    <style id="heading4"            _name="Heading 4"/>
-    <style id="heading5"            _name="Heading 5"/>
-    <style id="heading6"            _name="Heading 6"/>
+    <style id="heading0"            name="Heading 0"/>
+    <style id="heading1"            name="Heading 1"/>
+    <style id="heading2"            name="Heading 2"/>
+    <style id="heading3"            name="Heading 3"/>
+    <style id="heading4"            name="Heading 4"/>
+    <style id="heading5"            name="Heading 5"/>
+    <style id="heading6"            name="Heading 6"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/desktop.lang b/data/language-specs/desktop.lang
index 9eac56d..c06cd76 100644
--- a/data/language-specs/desktop.lang
+++ b/data/language-specs/desktop.lang
@@ -17,12 +17,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="desktop" _name=".desktop" version="2.0" _section="Other">
+<language id="desktop" name=".desktop" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">application/x-gnome-app-info;application/x-desktop</property>
     <property name="globs">*.desktop;*.kdelnk</property>
@@ -30,18 +29,16 @@
   </metadata>
 
   <styles>
-    <style id="group" _name="Group" map-to="def:keyword"/>
-    <!-- Translators: "Key" here means key value, that is the left hand
-         side in a myoption=something line in a .desktop file -->
-    <style id="key" _name="Key" map-to="def:type"/>
-    <style id="language" _name="Translation" map-to="def:decimal"/>
-    <style id="number" _name="Number" map-to="def:floating-point"/>
-    <style id="boolean" _name="Boolean" map-to="def:floating-point"/>
-    <style id="exec-parameter" _name="Exec parameter" map-to="def:floating-point"/>
-    <style id="encoding" _name="Encoding" map-to="def:floating-point"/>
-    <style id="category-main" _name="Main Category" map-to="def:reserved"/>
-    <style id="category-additional" _name="Additional Category" map-to="def:identifier"/>
-    <style id="category-reserved" _name="Reserved Category" map-to="def:note"/>
+    <style id="group" name="Group" map-to="def:keyword"/>
+    <style id="key" name="Key" map-to="def:type"/>
+    <style id="language" name="Translation" map-to="def:decimal"/>
+    <style id="number" name="Number" map-to="def:floating-point"/>
+    <style id="boolean" name="Boolean" map-to="def:floating-point"/>
+    <style id="exec-parameter" name="Exec parameter" map-to="def:floating-point"/>
+    <style id="encoding" name="Encoding" map-to="def:floating-point"/>
+    <style id="category-main" name="Main Category" map-to="def:reserved"/>
+    <style id="category-additional" name="Additional Category" map-to="def:identifier"/>
+    <style id="category-reserved" name="Reserved Category" map-to="def:note"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/diff.lang b/data/language-specs/diff.lang
index 722b61b..76717eb 100644
--- a/data/language-specs/diff.lang
+++ b/data/language-specs/diff.lang
@@ -16,25 +16,24 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="diff" _name="Diff" version="2.0" _section="Other">
+<language id="diff" name="Diff" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/x-diff;text/x-patch;text/x-reject</property>
     <property name="globs">*.diff;*.patch;*.rej</property>
   </metadata>
 
   <styles>
-    <style id="added-line"    _name="Added line"/> <!--Others 2-->
-    <style id="removed-line"  _name="Removed line"/> <!--Others 3-->
-    <style id="changed-line"  _name="Changed line"/> <!--Preprocessor-->
-    <style id="special-case"  _name="Special case"/> <!--String-->
-    <style id="location"      _name="Location"/> <!--Keyword-->
-    <style id="ignore"        _name="Ignore" map-to="def:comment"/>
-    <style id="diff-file"     _name=""/> <!--Data Type-->
+    <style id="added-line"    name="Added line"/> <!--Others 2-->
+    <style id="removed-line"  name="Removed line"/> <!--Others 3-->
+    <style id="changed-line"  name="Changed line"/> <!--Preprocessor-->
+    <style id="special-case"  name="Special case"/> <!--String-->
+    <style id="location"      name="Location"/> <!--Keyword-->
+    <style id="ignore"        name="Ignore" map-to="def:comment"/>
+    <style id="diff-file"     name=""/> <!--Data Type-->
   </styles>
 
   <definitions>
diff --git a/data/language-specs/docbook.lang b/data/language-specs/docbook.lang
index ad679b0..390722d 100644
--- a/data/language-specs/docbook.lang
+++ b/data/language-specs/docbook.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="docbook" _name="DocBook" version="2.0" _section="Markup">
+<language id="docbook" name="DocBook" version="2.0" _section="Markup">
   <metadata>
     <property name="mimetypes">application/docbook+xml</property>
     <property name="globs">*.docbook</property>
@@ -30,10 +29,10 @@
   </metadata>
 
   <styles>
-    <style id="header-elements" _name="Header Elements" map-to="def:keyword"/>
-    <style id="formatting-elements" _name="Formatting Elements" map-to="def:keyword"/>
-    <style id="gui-elements" _name="GUI Elements" map-to="def:keyword"/>
-    <style id="structural-elements" _name="Structural Elements" map-to="def:keyword"/>
+    <style id="header-elements" name="Header Elements" map-to="def:keyword"/>
+    <style id="formatting-elements" name="Formatting Elements" map-to="def:keyword"/>
+    <style id="gui-elements" name="GUI Elements" map-to="def:keyword"/>
+    <style id="structural-elements" name="Structural Elements" map-to="def:keyword"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/dosbatch.lang b/data/language-specs/dosbatch.lang
index d9622b9..c2272f9 100644
--- a/data/language-specs/dosbatch.lang
+++ b/data/language-specs/dosbatch.lang
@@ -16,9 +16,8 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 <language id="dosbatch" _name="DOS Batch" version="2.0" _section="Script">
@@ -28,10 +27,10 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="commands" _name="Command" map-to="def:keyword"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="commands" name="Command" map-to="def:keyword"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/dot.lang b/data/language-specs/dot.lang
index 226656a..a56d63b 100644
--- a/data/language-specs/dot.lang
+++ b/data/language-specs/dot.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="dot" _name="Graphviz Dot" version="2.0" _section="Other">
+<language id="dot" name="Graphviz Dot" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/vnd.graphviz</property>
     <property name="globs">*.dot;*.gv</property>
@@ -31,10 +30,10 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="attribute" _name="Attribute name" map-to="def:type"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="attribute" name="Attribute name" map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/dpatch.lang b/data/language-specs/dpatch.lang
index ef79768..49afbd6 100644
--- a/data/language-specs/dpatch.lang
+++ b/data/language-specs/dpatch.lang
@@ -16,19 +16,18 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="dpatch" _name="DPatch" version="2.0" _section="Other">
+<language id="dpatch" name="DPatch" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/x-dpatch</property>
     <property name="globs">*.dpatch</property>
   </metadata>
 
   <styles>
-    <style id="patch-start" _name="Patch Start" map-to="def:keyword"/>
+    <style id="patch-start" name="Patch Start" map-to="def:keyword"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/dtd.lang b/data/language-specs/dtd.lang
index b793cad..039e4d6 100644
--- a/data/language-specs/dtd.lang
+++ b/data/language-specs/dtd.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="dtd" _name="DTD" version="2.0" _section="Markup">
+<language id="dtd" name="DTD" version="2.0" _section="Markup">
     <metadata>
       <property name="mimetypes">text/x-dtd</property>
       <property name="globs">*.dtd</property>
@@ -30,10 +29,10 @@
     </metadata>
 
     <styles>
-      <style id="entity" _name="entity" map-to="xml:entity"/>
-      <style id="decl" _name="decl" map-to="xml:doctype"/>
-      <style id="error" _name="error" map-to="xml:error"/>
-      <style id="quoted-value" _name="Quoted Value" map-to="xml:attribute-value"/>
+      <style id="entity" name="entity" map-to="xml:entity"/>
+      <style id="decl" name="decl" map-to="xml:doctype"/>
+      <style id="error" name="error" map-to="xml:error"/>
+      <style id="quoted-value" name="Quoted Value" map-to="xml:attribute-value"/>
     </styles>
 
     <definitions>
diff --git a/data/language-specs/dtl.lang b/data/language-specs/dtl.lang
index c94df8d..faa9a6d 100755
--- a/data/language-specs/dtl.lang
+++ b/data/language-specs/dtl.lang
@@ -31,17 +31,17 @@
   </metadata>
 
   <styles>
-    <style id="comment"         _name="Comment" map-to="def:comment"/>
-    <style id="error"           _name="Error" map-to="def:error"/>
-    <style id="escape"          _name="Escaped Character" map-to="def:special-char"/>
-    <style id="string"          _name="String" map-to="def:string"/>
-    <style id="keyword"         _name="Keyword" map-to="def:keyword"/>
-    <style id="filters"         _name="Null Value" map-to="def:function"/>
-    <style id="boolean"         _name="Boolean value" map-to="def:boolean"/>
-    <style id="floating-point"  _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal"         _name="Decimal number" map-to="def:decimal"/>
-    <style id="octal"           _name="Octal number" map-to="def:base-n-integer"/>
-    <style id="hexadecimal"     _name="Hexadecimal number" map-to="def:base-n-integer"/>
+    <style id="comment"         name="Comment" map-to="def:comment"/>
+    <style id="error"           name="Error" map-to="def:error"/>
+    <style id="escape"          name="Escaped Character" map-to="def:special-char"/>
+    <style id="string"          name="String" map-to="def:string"/>
+    <style id="keyword"         name="Keyword" map-to="def:keyword"/>
+    <style id="filters"         name="Null Value" map-to="def:function"/>
+    <style id="boolean"         name="Boolean value" map-to="def:boolean"/>
+    <style id="floating-point"  name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal"         name="Decimal number" map-to="def:decimal"/>
+    <style id="octal"           name="Octal number" map-to="def:base-n-integer"/>
+    <style id="hexadecimal"     name="Hexadecimal number" map-to="def:base-n-integer"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/eiffel.lang b/data/language-specs/eiffel.lang
index 4dec05e..f5b26f9 100644
--- a/data/language-specs/eiffel.lang
+++ b/data/language-specs/eiffel.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="eiffel" _name="Eiffel" version="2.0" _section="Source">
+<language id="eiffel" name="Eiffel" version="2.0" _section="Source">
 
   <metadata>
     <property name="mimetypes">text/x-eiffel</property>
@@ -30,20 +29,20 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="debug" _name="Debug" map-to="def:preprocessor"/>
-    <style id="assertion" _name="Assertion" map-to="def:preprocessor"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="design-by-contract" _name="Design by Contract" map-to="def:keyword"/>
-    <style id="exception-handling" _name="Exception Handling" map-to="def:keyword"/>
-    <style id="predefined-variable" _name="Predefined Variable" map-to="def:builtin"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="void" _name="Void Value" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean Value" map-to="def:boolean"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="hexadecimal" _name="Hexadecimal number" map-to="def:base-n-integer"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="debug" name="Debug" map-to="def:preprocessor"/>
+    <style id="assertion" name="Assertion" map-to="def:preprocessor"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="design-by-contract" name="Design by Contract" map-to="def:keyword"/>
+    <style id="exception-handling" name="Exception Handling" map-to="def:keyword"/>
+    <style id="predefined-variable" name="Predefined Variable" map-to="def:builtin"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
+    <style id="void" name="Void Value" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean Value" map-to="def:boolean"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="hexadecimal" name="Hexadecimal number" map-to="def:base-n-integer"/>
   </styles>
 
   <default-regex-options case-sensitive="true"/>
diff --git a/data/language-specs/erlang.lang b/data/language-specs/erlang.lang
index 75ee0d3..9bb814e 100644
--- a/data/language-specs/erlang.lang
+++ b/data/language-specs/erlang.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="erlang" _name="Erlang" version="2.0" _section="Source">
+<language id="erlang" name="Erlang" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-erlang</property>
     <property name="globs">*.erl;*.hrl</property>
@@ -29,17 +28,17 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="operator" _name="Operator" map-to="def:operator"/>
-    <style id="atom" _name="Atom" map-to="def:type"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="character" _name="Character" map-to="def:character"/>
-    <style id="floating-point" _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="base-n-integer" _name="Base-N Integer" map-to="def:base-n-integer"/>
-    <style id="builtin" _name="Builtin" map-to="def:builtin"/>
-    <style id="compiler-directive" _name="Compiler Directive" map-to="def:preprocessor"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="operator" name="Operator" map-to="def:operator"/>
+    <style id="atom" name="Atom" map-to="def:type"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="character" name="Character" map-to="def:character"/>
+    <style id="floating-point" name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="base-n-integer" name="Base-N Integer" map-to="def:base-n-integer"/>
+    <style id="builtin" name="Builtin" map-to="def:builtin"/>
+    <style id="compiler-directive" name="Compiler Directive" map-to="def:preprocessor"/>
   </styles>
 
   <definitions>
@@ -219,12 +218,14 @@
     <context id="compiler-directives" style-ref="compiler-directive">
       <prefix>-</prefix>
       <keyword>author</keyword>
+      <keyword>behaviour</keyword>
       <keyword>compile</keyword>
       <keyword>copyright</keyword>
       <keyword>define</keyword>
       <keyword>doc</keyword>
       <keyword>else</keyword>
       <keyword>endif</keyword>
+      <keyword>error</keyword>
       <keyword>export</keyword>
       <keyword>file</keyword>
       <keyword>ifdef</keyword>
@@ -233,8 +234,11 @@
       <keyword>include_lib</keyword>
       <keyword>include</keyword>
       <keyword>module</keyword>
+      <keyword>on_load</keyword>
       <keyword>record</keyword>
       <keyword>undef</keyword>
+      <keyword>vsn</keyword>
+      <keyword>warning</keyword>
     </context>
 
     <context id="erlang" class="no-spell-check">
diff --git a/data/language-specs/fcl.lang b/data/language-specs/fcl.lang
index afaa188..1aa20db 100644
--- a/data/language-specs/fcl.lang
+++ b/data/language-specs/fcl.lang
@@ -20,19 +20,19 @@
  License along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="fcl" _name="FCL" version="2.0" _section="Scientific">
+<language id="fcl" name="FCL" version="2.0" _section="Scientific">
   <metadata>
     <property name="globs">*.fcl</property>
     <property name="line-comment-start">//</property>
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"           map-to="def:comment"/>
-    <style id="floating-point"    _name="Floating Point"    map-to="def:floating-point"/>
-    <style id="keyword"           _name="Keyword"           map-to="def:keyword"/>
-    <style id="block"             _name="Block"             map-to="def:function"/>
-    <style id="decimal"           _name="Decimal"           map-to="def:decimal"/>
-    <style id="reserved-constant" _name="Reserved Constant" map-to="def:special-constant"/>
+    <style id="comment"           name="Comment"           map-to="def:comment"/>
+    <style id="floating-point"    name="Floating Point"    map-to="def:floating-point"/>
+    <style id="keyword"           name="Keyword"           map-to="def:keyword"/>
+    <style id="block"             name="Block"             map-to="def:function"/>
+    <style id="decimal"           name="Decimal"           map-to="def:decimal"/>
+    <style id="reserved-constant" name="Reserved Constant" map-to="def:special-constant"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/forth.lang b/data/language-specs/forth.lang
index 821b216..64ed716 100644
--- a/data/language-specs/forth.lang
+++ b/data/language-specs/forth.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="forth" _name="Forth" version="2.0" _section="Source">
+<language id="forth" name="Forth" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-forth</property>
     <property name="globs">*.frt;*.fs</property>
@@ -31,15 +30,15 @@
   </metadata>
 
   <styles>
-    <style id="comment"       _name="Comment"            map-to="def:comment"/>
-    <style id="string"        _name="String"             map-to="def:string"/>
-    <style id="preprocessor"  _name="Preprocessor"       map-to="def:preprocessor"/>
-    <style id="keyword"       _name="Keyword"            map-to="def:statement"/>
-    <style id="type"          _name="Data Type"          map-to="def:type"/>
-    <style id="number"        _name="Number"             map-to="def:decimal"/>
-    <style id="debugs"        _name="Debug Code"         map-to="def:comment"/>
-    <style id="error"         _name="Error Text"         map-to="def:error"/>
-    <style id="compiler"      _name="Compiler Directive" map-to="def:identifier"/>
+    <style id="comment"       name="Comment"            map-to="def:comment"/>
+    <style id="string"        name="String"             map-to="def:string"/>
+    <style id="preprocessor"  name="Preprocessor"       map-to="def:preprocessor"/>
+    <style id="keyword"       name="Keyword"            map-to="def:statement"/>
+    <style id="type"          name="Data Type"          map-to="def:type"/>
+    <style id="number"        name="Number"             map-to="def:decimal"/>
+    <style id="debugs"        name="Debug Code"         map-to="def:comment"/>
+    <style id="error"         name="Error Text"         map-to="def:error"/>
+    <style id="compiler"      name="Compiler Directive" map-to="def:identifier"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/fortran.lang b/data/language-specs/fortran.lang
index 134c8c3..0b540c6 100644
--- a/data/language-specs/fortran.lang
+++ b/data/language-specs/fortran.lang
@@ -17,12 +17,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="fortran" _name="Fortran 95" version="2.0" _section="Source">
+<language id="fortran" name="Fortran 95" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-fortran</property>
     <property name="globs">*.f;*.f90;*.f95;*.for;*.F;*.F90</property>
@@ -30,18 +29,18 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="floating-point" _name="Floating Point" map-to="def:floating-point"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="intrinsic" _name="Intrinsic function" map-to="def:builtin"/>
-    <style id="boz-literal" _name="BOZ Literal" map-to="def:base-n-integer"/>
-    <style id="decimal" _name="Decimal" map-to="def:decimal"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="openmp-directives" _name="OpenMP directives" map-to="def:preprocessor"/>
-    <style id="included-file" _name="Included File" map-to="def:string"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="floating-point" name="Floating Point" map-to="def:floating-point"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="intrinsic" name="Intrinsic function" map-to="def:builtin"/>
+    <style id="boz-literal" name="BOZ Literal" map-to="def:base-n-integer"/>
+    <style id="decimal" name="Decimal" map-to="def:decimal"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="openmp-directives" name="OpenMP directives" map-to="def:preprocessor"/>
+    <style id="included-file" name="Included File" map-to="def:string"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/fsharp.lang b/data/language-specs/fsharp.lang
index de6ea05..b2f575d 100644
--- a/data/language-specs/fsharp.lang
+++ b/data/language-specs/fsharp.lang
@@ -16,13 +16,12 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
-<language id="fsharp" _name="F#" version="2.0" _section="Source">
+<language id="fsharp" name="F#" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-fsharp</property>
     <property name="globs">*.fs;</property>
@@ -31,25 +30,24 @@
     <property name="block-comment-end">*)</property>
   </metadata>
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="base-n-integer" _name="Base-N Integer" map-to="def:base-n-integer"/>
-    <style id="floating-point" _name="Floating Point number" map-to="def:floating-point"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="meta-keyword" _name="Type, module or object keyword" map-to="def:keyword"/>
-    <style id="fun-keyword" _name="Builtin-function keyword" map-to="def:keyword"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="label" _name="Labeled argument" map-to="def:type"/>
-    <style id="poly-variant" _name="Polymorphic Variant" map-to="def:type"/>
-    <style id="variant" _name="Variant Constructor" map-to="def:type"/>
-    <!-- Translators: this is a specific variable called Type -->
-    <style id="type-var" _name="Type Variable" map-to="def:type"/>
-    <style id="module" _name="Module Path" map-to="def:type"/>
-    <style id="escape" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="base-n-integer" name="Base-N Integer" map-to="def:base-n-integer"/>
+    <style id="floating-point" name="Floating Point number" map-to="def:floating-point"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="meta-keyword" name="Type, module or object keyword" map-to="def:keyword"/>
+    <style id="fun-keyword" name="Builtin-function keyword" map-to="def:keyword"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="label" name="Labeled argument" map-to="def:type"/>
+    <style id="poly-variant" name="Polymorphic Variant" map-to="def:type"/>
+    <style id="variant" name="Variant Constructor" map-to="def:type"/>
+    <style id="type-var" name="Type Variable" map-to="def:type"/>
+    <style id="module" name="Module Path" map-to="def:type"/>
+    <style id="escape" name="Escaped Character" map-to="def:special-char"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="null-value" name="Null Value" map-to="def:special-constant"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/gap.lang b/data/language-specs/gap.lang
index 6aec8fe..8bd2c59 100644
--- a/data/language-specs/gap.lang
+++ b/data/language-specs/gap.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="gap" _name="GAP" version="2.0" _section="Scientific">
+<language id="gap" name="GAP" version="2.0" _section="Scientific">
   <metadata>
     <property name="mimetypes">text/x-gap</property>
     <property name="globs">*.g;*.gd;*.gi;*.gap</property>
@@ -29,11 +28,11 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="character" _name="Character" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="function" _name="Function" map-to="def:function"/>
-    <style id="decimal" _name="Decimal" map-to="def:decimal"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="character" name="Character" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="function" name="Function" map-to="def:function"/>
+    <style id="decimal" name="Decimal" map-to="def:decimal"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/gdb-log.lang b/data/language-specs/gdb-log.lang
index 97c77d1..32fee16 100644
--- a/data/language-specs/gdb-log.lang
+++ b/data/language-specs/gdb-log.lang
@@ -12,9 +12,8 @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   Lesser General Public License for more details.
 
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  You should have received a copy of the GNU Lesser General Public License
+  along with this library; if not, see <http://www.gnu.org/licenses/>.
 -->
 <language id="gdb-log" _name="GDB Log" version="2.0" _section="Other">
   <metadata>
@@ -22,16 +21,16 @@
   </metadata>
 
   <styles>
-    <style id="thread-action" _name="Thread Action" map-to="def:comment"/>
-    <style id="thread-header" _name="Thread Header" map-to="def:statement"/>
-    <style id="frame-number" _name="Frame Number" map-to="def:keyword"/>
-    <style id="address" _name="Address" map-to="def:number"/>
-    <style id="function" _name="Function" map-to="def:function"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="filename" _name="Filename" map-to="def:statement"/>
-    <style id="optimized-out" _name="Optimized Out" map-to="def:special-constant"/>
-    <style id="incomplete-sequence" _name="Incomplete Sequence" map-to="def:special-constant"/>
-    <style id="prompt" _name="Prompt" map-to="def:comment"/>
+    <style id="thread-action" name="Thread Action" map-to="def:comment"/>
+    <style id="thread-header" name="Thread Header" map-to="def:statement"/>
+    <style id="frame-number" name="Frame Number" map-to="def:keyword"/>
+    <style id="address" name="Address" map-to="def:number"/>
+    <style id="function" name="Function" map-to="def:function"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="filename" name="Filename" map-to="def:statement"/>
+    <style id="optimized-out" name="Optimized Out" map-to="def:special-constant"/>
+    <style id="incomplete-sequence" name="Incomplete Sequence" map-to="def:special-constant"/>
+    <style id="prompt" name="Prompt" map-to="def:comment"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/genie.lang b/data/language-specs/genie.lang
index b6c956c..de94d75 100644
--- a/data/language-specs/genie.lang
+++ b/data/language-specs/genie.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="genie" _name="Genie" version="2.0" _section="Source">
+<language id="genie" name="Genie" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-genie</property>
     <property name="globs">*.gs</property>
@@ -31,20 +30,20 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="multiline-string" _name="Multiline string" map-to="def:string"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="regex" _name="Regular Expression" map-to="def:string"/>
-    <style id="namespace" _name="Namespace" map-to="def:preprocessor"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="definition" _name="Definition" map-to="def:keyword"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="special-variable" _name="Special Variable" map-to="def:identifier"/>
-    <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean" map-to="def:boolean"/>
-    <style id="number" _name="Number" map-to="def:number"/>
-    <style id="builtin" _name="Builtin Function" map-to="def:builtin"/>
-    <style id="printf" _name="printf Conversion" map-to="def:special-char"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="multiline-string" name="Multiline string" map-to="def:string"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="regex" name="Regular Expression" map-to="def:string"/>
+    <style id="namespace" name="Namespace" map-to="def:preprocessor"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="definition" name="Definition" map-to="def:keyword"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="special-variable" name="Special Variable" map-to="def:identifier"/>
+    <style id="null-value" name="Null Value" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean" map-to="def:boolean"/>
+    <style id="number" name="Number" map-to="def:number"/>
+    <style id="builtin" name="Builtin Function" map-to="def:builtin"/>
+    <style id="printf" name="printf Conversion" map-to="def:special-char"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/glsl.lang b/data/language-specs/glsl.lang
index 058ce87..a7be53f 100644
--- a/data/language-specs/glsl.lang
+++ b/data/language-specs/glsl.lang
@@ -17,9 +17,8 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
@@ -38,13 +37,13 @@ http://www.opengl.org/registry/doc/GLSLangSpec.4.00.7.pdf
   </metadata>
 
   <styles>
-    <style id="preprocessor"      _name="Preprocessor"          map-to="def:preprocessor"/>
-    <style id="type"              _name="Data Type"             map-to="def:type"/>
-    <style id="keyword"           _name="Keyword"               map-to="def:keyword"/>
-    <style id="builtin-function"  _name="Builtin Function"      map-to="def:builtin"/>
-    <style id="builtin-constant"  _name="Builtin Constant"      map-to="def:constant"/>
-    <style id="builtin-variable"  _name="Builtin Variable"      map-to="def:identifier"/>
-    <style id="future-use"        _name="Reserved Keywords"/>
+    <style id="preprocessor"      name="Preprocessor"          map-to="def:preprocessor"/>
+    <style id="type"              name="Data Type"             map-to="def:type"/>
+    <style id="keyword"           name="Keyword"               map-to="def:keyword"/>
+    <style id="builtin-function"  name="Builtin Function"      map-to="def:builtin"/>
+    <style id="builtin-constant"  name="Builtin Constant"      map-to="def:constant"/>
+    <style id="builtin-variable"  name="Builtin Variable"      map-to="def:identifier"/>
+    <style id="future-use"        name="Reserved Keywords"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/go.lang b/data/language-specs/go.lang
index b5af3a1..bfe31ed 100644
--- a/data/language-specs/go.lang
+++ b/data/language-specs/go.lang
@@ -15,14 +15,13 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 
   See: http://code.google.com/p/go/source/browse/misc/vim/syntax/go.vim
 -->
-<language id="go" _name="Go" version="2.0" _section="Source">
+<language id="go" name="Go" version="2.0" _section="Source">
   <metadata>
     <property name="mimetype">text/x-go</property>
     <property name="globs">*.go</property>
@@ -32,22 +31,22 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"             map-to="def:comment"/>
-    <style id="error"             _name="Error"               map-to="def:error"/>
-    <style id="string"            _name="String"              map-to="def:string"/>
-    <style id="char"              _name="Character"           map-to="def:character"/>
-    <style id="keyword"           _name="Keyword"             map-to="def:keyword"/>
-    <style id="type"              _name="Data Type"           map-to="def:type"/>
-    <style id="printf"            _name="printf Conversion"   map-to="def:special-char"/>
-    <style id="escaped-character" _name="Escaped Character"   map-to="def:special-char"/>
-    <style id="floating-point"    _name="Floating point number" map-to="def:floating-point"/>
-    <style id="imaginary"         _name="Imaginary number"    map-to="def:number"/>
-    <style id="decimal"           _name="Decimal number"      map-to="def:decimal"/>
-    <style id="octal"             _name="Octal number"        map-to="def:base-n-integer"/>
-    <style id="hexadecimal"       _name="Hexadecimal number"  map-to="def:base-n-integer"/>
-    <style id="boolean"           _name="Boolean value"       map-to="def:boolean"/>
-    <style id="builtin-constant"  _name="Builtin Constant"    map-to="def:special-constant"/>
-    <style id="builtin-function"  _name="Builtin Function"    map-to="def:builtin"/>
+    <style id="comment"           name="Comment"             map-to="def:comment"/>
+    <style id="error"             name="Error"               map-to="def:error"/>
+    <style id="string"            name="String"              map-to="def:string"/>
+    <style id="char"              name="Character"           map-to="def:character"/>
+    <style id="keyword"           name="Keyword"             map-to="def:keyword"/>
+    <style id="type"              name="Data Type"           map-to="def:type"/>
+    <style id="printf"            name="printf Conversion"   map-to="def:special-char"/>
+    <style id="escaped-character" name="Escaped Character"   map-to="def:special-char"/>
+    <style id="floating-point"    name="Floating point number" map-to="def:floating-point"/>
+    <style id="imaginary"         name="Imaginary number"    map-to="def:number"/>
+    <style id="decimal"           name="Decimal number"      map-to="def:decimal"/>
+    <style id="octal"             name="Octal number"        map-to="def:base-n-integer"/>
+    <style id="hexadecimal"       name="Hexadecimal number"  map-to="def:base-n-integer"/>
+    <style id="boolean"           name="Boolean value"       map-to="def:boolean"/>
+    <style id="builtin-constant"  name="Builtin Constant"    map-to="def:special-constant"/>
+    <style id="builtin-function"  name="Builtin Function"    map-to="def:builtin"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/groovy.lang b/data/language-specs/groovy.lang
new file mode 100644
index 0000000..a91ae7a
--- /dev/null
+++ b/data/language-specs/groovy.lang
@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ This file is part of GtkSourceView
+
+ Copyright (C) 2003 Gustavo Giráldez <gustavo giraldez gmx net>
+ Copyright (C) 2006 Jeff Walden <jwalden mit edu>
+ Copyright (C) 2017 Roman Donchenko
+
+ GtkSourceView is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ GtkSourceView is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
+
+-->
+<language id="groovy" name="Groovy" version="2.0" _section="Source">
+  <metadata>
+    <property name="globs">*.groovy</property>
+    <property name="line-comment-start">//</property>
+    <property name="block-comment-start">/*</property>
+    <property name="block-comment-end">*/</property>
+  </metadata>
+
+  <styles>
+    <style id="comment"           name="Comment"                   map-to="def:comment"/>
+    <style id="escaped-character" name="Escaped Character"         map-to="def:special-char"/>
+    <style id="interpolation"     name="Interpolation Syntax"      map-to="def:special-char"/>
+    <style id="interpolated"      name="Interpolated Expression"   map-to="def:identifier"/>
+    <style id="string"            name="String"                    map-to="def:string"/>
+    <style id="external"          name="External"                  map-to="def:preprocessor"/>
+    <style id="declaration"       name="Declaration"               map-to="def:type"/>
+    <style id="storage-class"     name="Storage Class"             map-to="def:type"/>
+    <style id="scope-declaration" name="Scope Declaration"         map-to="def:type"/>
+    <style id="operator"          name="Operator"                  map-to="def:operator"/>
+    <style id="keyword"           name="Keyword"                   map-to="def:keyword"/>
+    <style id="null-value"        name="Null Value"                map-to="def:special-constant"/>
+    <style id="boolean"           name="Boolean value"             map-to="def:boolean"/>
+    <style id="number"            name="Number"                    map-to="def:number"/>
+    <style id="type"              name="Data Type"                 map-to="def:type"/>
+  </styles>
+
+  <definitions>
+    <define-regex id="escaped-character" extended="true">
+      \\(
+        # character escape
+        [nrtbf"'\\$] |
+        # unicode escape
+        u[0-9A-Fa-f]{4} |
+        # octal escape
+        [0-3] ([0-7] [0-7]?)? | [4-7] [0-7]?
+      )
+    </define-regex>
+
+    <define-regex id="letter" extended="true">
+      [a-zA-Z\x{c0}-\x{d6}\x{d8}-\x{f6}\x{f8}-\x{ff}\x{100}-\x{fffe}_]
+    </define-regex>
+
+    <context id="escaped-character">
+      <include>
+        <context style-ref="escaped-character">
+          <match>\%{escaped-character}</match>
+        </context>
+        <context ref="def:line-continue"/>
+        <context style-ref="def:error">
+          <!-- backslashes not part of a valid escape sequence are erroneous -->
+          <match>\\</match>
+        </context>
+      </include>
+    </context>
+
+    <context id="placeholder">
+      <include>
+        <context style-ref="interpolated">
+          <match extended="true">
+            (\$)
+            # one or more dollarless identifiers separated by dots
+            \%{letter} (\%{letter} | \d)*
+            (\. \%{letter} (\%{letter} | \d)*)*
+          </match>
+          <include>
+            <context sub-pattern="1" style-ref="interpolation"/>
+          </include>
+        </context>
+        <context style-ref="interpolated">
+          <start>\$\{</start>
+          <end>\}</end>
+          <include>
+            <context sub-pattern="0" where="start" style-ref="interpolation"/>
+            <context sub-pattern="0" where="end" style-ref="interpolation"/>
+            <context ref="groovy"/>
+          </include>
+        </context>
+      </include>
+    </context>
+
+    <!-- a dollar that isn't part of a placeholder is erroneous in some instances -->
+    <context id="bad-placeholder" style-ref="def:error">
+      <match>\$</match>
+    </context>
+
+    <context id="triple-single-quoted-string" style-ref="string" class="string" 
class-disabled="no-spell-check">
+      <start>'''</start>
+      <end>'''</end>
+      <include>
+        <context ref="escaped-character"/>
+      </include>
+    </context>
+
+    <context id="single-quoted-string" end-at-line-end="true" style-ref="string" class="string" 
class-disabled="no-spell-check">
+      <start>'</start>
+      <end>'</end>
+      <include>
+        <context ref="escaped-character"/>
+      </include>
+    </context>
+
+    <context id="triple-double-quoted-string" style-ref="string" class="string" 
class-disabled="no-spell-check">
+      <start>"""</start>
+      <end>"""</end>
+      <include>
+        <context ref="escaped-character"/>
+        <context ref="placeholder"/>
+        <context ref="bad-placeholder"/>
+      </include>
+    </context>
+
+    <context id="double-quoted-string" end-at-line-end="true" style-ref="string" class="string" 
class-disabled="no-spell-check">
+      <start>"</start>
+      <end>"</end>
+      <include>
+        <context ref="escaped-character"/>
+        <context ref="placeholder"/>
+        <context ref="bad-placeholder"/>
+      </include>
+    </context>
+
+    <context id="slashy-string" style-ref="string" class="string">
+      <start extended="true">
+        # The initial slash must not be preceded by a token that can end an expression.
+        # Otherwise, it's interpreted as a division operator, not the start of a slashy string.
+        # It'd be complicated to verify whole tokens with a regex, but the last non-space
+        # character is a good indicator by itself. We can use a negative lookbehind assertion
+        # to verify that it's not a character that an expression-ending token can end with.
+
+        # Trouble is, a lookbehind assertion has to consist of fixed-length alternatives, so
+        # we can't have it match an arbitrary amount of whitespace. Thus, we do an approximate
+        # check, only trying zero and one spaces.
+
+        (?&lt;! \+\+   | --   | [])}"\d]   | \%{letter} |
+                \+\+\s | --\s | [])}"\d]\s | \%{letter}\s )
+
+        /
+      </start>
+      <end>/</end>
+      <include>
+        <context style-ref="escaped-character">
+          <match>\\/</match>
+        </context>
+        <context ref="def:line-continue"/>
+        <context ref="placeholder"/>
+        <!-- standalone dollars and backslashes are interpreted literally -->
+      </include>
+    </context>
+
+    <context id="dollar-slashy-string" style-ref="string" class="string">
+      <start extended="true">
+        # Strictly speaking, a dollar slashy string has the same requirements on the
+        # preceding token as a plain slashy string, but if those requirements aren't
+        # met, it's parsed as a dollar followed by a division operator, which isn't
+        # legal. So we don't bother with accounting for that case.
+
+        \$/
+
+        # We will, however, account for the case when there's a slash right after
+        # the initial $/. In that case, the construct is actually parsed as a dollar
+        # followed by a single-line comment. Which is still illegal... but as least
+        # this check is easy to implement.
+        (?=[^/])
+      </start>
+      <end>/\$</end>
+      <include>
+        <context style-ref="escaped-character">
+          <match>\$[$/]</match>
+        </context>
+        <context ref="def:line-continue"/>
+        <context ref="placeholder"/>
+      </include>
+    </context>
+
+    <context id="numeric" style-ref="number">
+      <match extended="true">
+        \b (
+          # floating-point
+          \d ([\d_]* \d)? (
+            \. \d ([\d_]* \d)? ([eE] [+-]? [\d_]* \d)? [dDfFgG]? |
+            [eE] [+-]? [\d_]* \d [dDfFgG]? |
+            [dDfF]
+          ) |
+          # integer
+          (
+            0 | # decimal zero
+            0[bB] [01] ([01_]* [01])? | # binary
+            0 [0-7] ([0-7_]* [0-7])? | # octal
+            [1-9] ([\d_]* \d)? | # decimal
+            0[xX] [\da-fA-F] ([\da-fA-F_]* [\da-fA-F])? # hexadecimal
+          ) [iIlLgG]?
+        ) \b
+      </match>
+    </context>
+
+    <!--
+      Some of the Java keywords are reserved in Groovy. We don't mark them
+      with a special style, though, because in some instances keywords can
+      be used as identifiers (e.g. when used as a member name), and even
+      reserved keywords are valid when used like that.
+    -->
+
+    <context id="externals" style-ref="external">
+      <keyword>import</keyword>
+      <keyword>package</keyword>
+    </context>
+
+    <context id="declarations" style-ref="declaration">
+      <keyword>class</keyword>
+      <keyword>enum</keyword>
+      <keyword>extends</keyword>
+      <keyword>implements</keyword>
+      <keyword>interface</keyword>
+      <keyword>native</keyword>
+      <keyword>throws</keyword>
+      <keyword>trait</keyword>
+    </context>
+
+    <context id="primitive-types" style-ref="type">
+      <keyword>boolean</keyword>
+      <keyword>byte</keyword>
+      <keyword>char</keyword>
+      <keyword>def</keyword>
+      <keyword>double</keyword>
+      <keyword>float</keyword>
+      <keyword>int</keyword>
+      <keyword>long</keyword>
+      <keyword>short</keyword>
+      <keyword>void</keyword>
+    </context>
+
+    <context id="storage-class" style-ref="storage-class">
+      <keyword>abstract</keyword>
+      <keyword>const</keyword>
+      <keyword>final</keyword>
+      <keyword>static</keyword>
+      <keyword>strictfp</keyword>
+      <keyword>synchronized</keyword>
+      <keyword>transient</keyword>
+      <keyword>volatile</keyword>
+    </context>
+
+    <context id="scope-declarations" style-ref="scope-declaration">
+      <keyword>private</keyword>
+      <keyword>protected</keyword>
+      <keyword>public</keyword>
+    </context>
+
+    <context id="flow" style-ref="keyword">
+      <keyword>assert</keyword>
+      <keyword>break</keyword>
+      <keyword>case</keyword>
+      <keyword>catch</keyword>
+      <keyword>continue</keyword>
+      <keyword>default</keyword>
+      <keyword>do</keyword>
+      <keyword>else</keyword>
+      <keyword>finally</keyword>
+      <keyword>for</keyword>
+      <keyword>goto</keyword>
+      <keyword>if</keyword>
+      <keyword>return</keyword>
+      <keyword>throw</keyword>
+      <keyword>switch</keyword>
+      <keyword>try</keyword>
+      <keyword>while</keyword>
+    </context>
+
+    <context id="operator" style-ref="operator">
+      <keyword>as</keyword>
+      <keyword>in</keyword>
+      <keyword>instanceof</keyword>
+      <keyword>new</keyword>
+      <keyword>super</keyword>
+      <keyword>this</keyword>
+    </context>
+
+    <context id="null-value" style-ref="null-value">
+      <keyword>null</keyword>
+    </context>
+
+    <context id="boolean" style-ref="boolean">
+      <keyword>false</keyword>
+      <keyword>true</keyword>
+    </context>
+
+    <context id="groovy" class="no-spell-check">
+      <include>
+        <context ref="def:shebang" style-ref="comment"/>
+        <context ref="def:c-like-comment" style-ref="comment"/>
+        <context ref="def:c-like-comment-multiline" style-ref="comment"/>
+        <context ref="def:line-continue"/>
+
+        <context ref="triple-single-quoted-string"/>
+        <context ref="single-quoted-string"/>
+        <context ref="triple-double-quoted-string"/>
+        <context ref="double-quoted-string"/>
+        <context ref="slashy-string"/>
+        <context ref="dollar-slashy-string"/>
+        <context ref="numeric"/>
+
+        <context ref="externals"/>
+        <context ref="declarations"/>
+        <context ref="primitive-types"/>
+        <context ref="storage-class"/>
+        <context ref="scope-declarations"/>
+        <context ref="flow"/>
+        <context ref="operator"/>
+        <context ref="null-value"/>
+        <context ref="boolean"/>
+      </include>
+    </context>
+  </definitions>
+</language>
diff --git a/data/language-specs/gtk-doc.lang b/data/language-specs/gtk-doc.lang
index 6a735f8..fa48255 100644
--- a/data/language-specs/gtk-doc.lang
+++ b/data/language-specs/gtk-doc.lang
@@ -16,25 +16,24 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 <!-- Copyright (C) 2006-2007 - Yevgen Muntyan <muntyan tamu edu> -->
-<language id="gtk-doc" _name="gtk-doc" version="2.0" _section="Markup" hidden="true">
+<language id="gtk-doc" name="gtk-doc" version="2.0" _section="Markup" hidden="true">
     <styles>
-        <style id="inline-docs-section" _name="Inline Documentation Section" map-to="def:doc-comment"/>
-        <style id="function-name" _name="Function Name" map-to="def:doc-comment-element"/>
-        <style id="signal-name" _name="Signal Name" map-to="def:doc-comment-element"/>
-        <style id="property-name" _name="Property Name" map-to="def:doc-comment-element"/>
-        <style id="parameter" _name="Parameter" map-to="def:doc-comment-element"/>
-        <style id="constant" _name="Constant" map-to="def:doc-comment-element"/>
-        <style id="type" _name="Type" map-to="def:doc-comment-element"/>
-        <style id="function" _name="Function" map-to="def:doc-comment-element"/>
-        <style id="return" _name="Return" map-to="def:doc-comment-element"/>
-        <style id="since" _name="Since" map-to="def:doc-comment-element"/>
-        <style id="deprecated" _name="Deprecated" map-to="def:doc-comment-element"/>
+        <style id="inline-docs-section" name="Inline Documentation Section" map-to="def:doc-comment"/>
+        <style id="function-name" name="Function Name" map-to="def:doc-comment-element"/>
+        <style id="signal-name" name="Signal Name" map-to="def:doc-comment-element"/>
+        <style id="property-name" name="Property Name" map-to="def:doc-comment-element"/>
+        <style id="parameter" name="Parameter" map-to="def:doc-comment-element"/>
+        <style id="constant" name="Constant" map-to="def:doc-comment-element"/>
+        <style id="type" name="Type" map-to="def:doc-comment-element"/>
+        <style id="function" name="Function" map-to="def:doc-comment-element"/>
+        <style id="return" name="Return" map-to="def:doc-comment-element"/>
+        <style id="since" name="Since" map-to="def:doc-comment-element"/>
+        <style id="deprecated" name="Deprecated" map-to="def:doc-comment-element"/>
     </styles>
 
     <definitions>
diff --git a/data/language-specs/gtkrc.lang b/data/language-specs/gtkrc.lang
index 7220522..dce7043 100644
--- a/data/language-specs/gtkrc.lang
+++ b/data/language-specs/gtkrc.lang
@@ -17,12 +17,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="gtkrc" _name="GtkRC" version="2.0" _section="Other">
+<language id="gtkrc" name="GtkRC" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/x-gtkrc</property>
     <property name="globs">gtkrc;.gtkrc;gtkrc-*;.gtkrc-*</property>
@@ -30,14 +29,14 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="decimal" _name="Decimal" map-to="def:decimal"/>
-    <style id="variable" _name="Data Type" map-to="def:type"/>
-    <style id="state" _name="Widget State" map-to="def:special-constant"/>
-    <style id="include-directive" _name="Include directive" map-to="def:preprocessor"/>
-    <style id="boolean-value" _name="Boolean value" map-to="def:boolean"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="decimal" name="Decimal" map-to="def:decimal"/>
+    <style id="variable" name="Data Type" map-to="def:type"/>
+    <style id="state" name="Widget State" map-to="def:special-constant"/>
+    <style id="include-directive" name="Include directive" map-to="def:preprocessor"/>
+    <style id="boolean-value" name="Boolean value" map-to="def:boolean"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/haddock.lang b/data/language-specs/haddock.lang
index 493b1ba..fb901d0 100644
--- a/data/language-specs/haddock.lang
+++ b/data/language-specs/haddock.lang
@@ -16,28 +16,27 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="haddock" _name="Haddock" version="2.0" _section="Markup" hidden="true">
+<language id="haddock" name="Haddock" version="2.0" _section="Markup" hidden="true">
 
   <styles>
-    <style id="markup"     _name="Inline Haddock Section" map-to="def:doc-comment"/>
-    <style id="directive"  _name="Haddock Directive" map-to="def:doc-comment-element"/>
-    <style id="identifier" _name="Hyperlinked Identifier" map-to="def:doc-comment-element"/>
-    <style id="module"     _name="Hyperlinked Module Name" map-to="def:doc-comment-element"/>
-    <style id="escape"     _name="Escape" map-to="def:special-char"/>
-    <style id="emphasis"   _name="Emphasis" map-to="def:doc-comment-element"/>
-    <style id="monospace"  _name="Monospace" />
-    <style id="codeblock"  _name="Code Block" />
-    <style id="property"   _name="Header Property" map-to="def:doc-comment-element"/>
-    <style id="itemized"   _name="Itemized list" map-to="def:doc-comment-element"/>
-    <style id="enumerated" _name="Enumerated list" map-to="def:doc-comment-element"/>
-    <style id="definition" _name="Definition list" map-to="def:doc-comment-element"/>
-    <style id="url"        _name="URL" map-to="def:underlined"/>
-    <style id="anchor"     _name="Anchor" map-to="def:doc-comment-element"/>
+    <style id="markup"     name="Inline Haddock Section" map-to="def:doc-comment"/>
+    <style id="directive"  name="Haddock Directive" map-to="def:doc-comment-element"/>
+    <style id="identifier" name="Hyperlinked Identifier" map-to="def:doc-comment-element"/>
+    <style id="module"     name="Hyperlinked Module Name" map-to="def:doc-comment-element"/>
+    <style id="escape"     name="Escape" map-to="def:special-char"/>
+    <style id="emphasis"   name="Emphasis" map-to="def:doc-comment-element"/>
+    <style id="monospace"  name="Monospace" />
+    <style id="codeblock"  name="Code Block" />
+    <style id="property"   name="Header Property" map-to="def:doc-comment-element"/>
+    <style id="itemized"   name="Itemized list" map-to="def:doc-comment-element"/>
+    <style id="enumerated" name="Enumerated list" map-to="def:doc-comment-element"/>
+    <style id="definition" name="Definition list" map-to="def:doc-comment-element"/>
+    <style id="url"        name="URL" map-to="def:underlined"/>
+    <style id="anchor"     name="Anchor" map-to="def:doc-comment-element"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/haskell-literate.lang b/data/language-specs/haskell-literate.lang
index 742b1dd..6cd5660 100644
--- a/data/language-specs/haskell-literate.lang
+++ b/data/language-specs/haskell-literate.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="haskell-literate" _name="Literate Haskell" version="2.0" _section="Source">
+<language id="haskell-literate" name="Literate Haskell" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-literate-haskell</property>
     <property name="globs">*.lhs</property>
diff --git a/data/language-specs/haskell.lang b/data/language-specs/haskell.lang
index 5460ba9..3dffbc0 100644
--- a/data/language-specs/haskell.lang
+++ b/data/language-specs/haskell.lang
@@ -17,12 +17,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="haskell" _name="Haskell" version="2.0" _section="Source">
+<language id="haskell" name="Haskell" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-haskell</property>
     <property name="globs">*.hs</property>
@@ -30,19 +29,19 @@
   </metadata>
 
   <styles>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="comment"      _name="Comment"      map-to="def:comment"/>
-    <style id="variable"     _name="Variable"                         />
-    <style id="symbol"       _name="Symbol"                           />
-    <style id="keyword"      _name="Keyword"      map-to="def:keyword"/>
-    <style id="type"         _name="Data Type"    map-to="def:type"/>
-    <style id="string"       _name="String"       map-to="def:string"/>
-    <style id="character"    _name="Character"    map-to="def:character"/>
-    <style id="char-escape"  _name="Escaped Character" map-to="def:special-char"/>
-    <style id="float"        _name="Float"        map-to="def:floating-point"/>
-    <style id="decimal"      _name="Decimal"      map-to="def:decimal"/>
-    <style id="octal"        _name="Octal"        map-to="def:base-n-integer"/>
-    <style id="hexadecimal"  _name="Hex"          map-to="def:base-n-integer"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="comment"      name="Comment"      map-to="def:comment"/>
+    <style id="variable"     name="Variable"                         />
+    <style id="symbol"       name="Symbol"                           />
+    <style id="keyword"      name="Keyword"      map-to="def:keyword"/>
+    <style id="type"         name="Data Type"    map-to="def:type"/>
+    <style id="string"       name="String"       map-to="def:string"/>
+    <style id="character"    name="Character"    map-to="def:character"/>
+    <style id="char-escape"  name="Escaped Character" map-to="def:special-char"/>
+    <style id="float"        name="Float"        map-to="def:floating-point"/>
+    <style id="decimal"      name="Decimal"      map-to="def:decimal"/>
+    <style id="octal"        name="Octal"        map-to="def:base-n-integer"/>
+    <style id="hexadecimal"  name="Hex"          map-to="def:base-n-integer"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/haxe.lang b/data/language-specs/haxe.lang
index 413ed48..c59e3c8 100644
--- a/data/language-specs/haxe.lang
+++ b/data/language-specs/haxe.lang
@@ -19,9 +19,8 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
@@ -32,7 +31,7 @@ References:
   https://haxe.org/manual/expression.html
 -->
 
-<language id="haxe" _name="Haxe" version="2.0" _section="Source">
+<language id="haxe" name="Haxe" version="2.0" _section="Source">
 
   <metadata>
 
@@ -45,23 +44,23 @@ References:
 
 
   <styles>
-    <style id="comment"           _name="Comment"           map-to="def:comment" />
-    <style id="external"          _name="External"          map-to="def:preprocessor" />
-    <style id="preprocessor"      _name="Preprocessor"      map-to="def:preprocessor" />
-    <style id="declaration"       _name="Declaration"       map-to="def:type" />
-    <style id="storage-class"     _name="Storage Class"     map-to="def:type" />
-    <style id="scope"             _name="Scope"             map-to="def:type" />
-    <style id="keyword"           _name="Keyword"           map-to="def:keyword" />
-    <style id="string"            _name="String"            map-to="def:string" />
-    <style id="number"            _name="Number"            map-to="def:decimal" />
-    <style id="boolean"           _name="Boolean value"     map-to="def:boolean" />
-    <style id="null-value"        _name="Null Value"        map-to="def:special-constant" />
-    <style id="type"              _name="Data Type"         map-to="def:identifier" />
-    <style id="metadata"          _name="Metadata"          map-to="def:constant" />
-    <style id="macro"             _name="Macro"             map-to="def:preprocessor" />
-    <style id="error"             _name="Error"             map-to="def:error" />
-    <style id="escaped-char"      _name="Escaped Character" map-to="def:special-char" />
-    <style id="identifier-prefix" _name="Identifier Prefix" map-to="def:warning" />
+    <style id="comment"           name="Comment"           map-to="def:comment" />
+    <style id="external"          name="External"          map-to="def:preprocessor" />
+    <style id="preprocessor"      name="Preprocessor"      map-to="def:preprocessor" />
+    <style id="declaration"       name="Declaration"       map-to="def:type" />
+    <style id="storage-class"     name="Storage Class"     map-to="def:type" />
+    <style id="scope"             name="Scope"             map-to="def:type" />
+    <style id="keyword"           name="Keyword"           map-to="def:keyword" />
+    <style id="string"            name="String"            map-to="def:string" />
+    <style id="number"            name="Number"            map-to="def:decimal" />
+    <style id="boolean"           name="Boolean value"     map-to="def:boolean" />
+    <style id="null-value"        name="Null Value"        map-to="def:special-constant" />
+    <style id="type"              name="Data Type"         map-to="def:identifier" />
+    <style id="metadata"          name="Metadata"          map-to="def:constant" />
+    <style id="macro"             name="Macro"             map-to="def:preprocessor" />
+    <style id="error"             name="Error"             map-to="def:error" />
+    <style id="escaped-char"      name="Escaped Character" map-to="def:special-char" />
+    <style id="identifier-prefix" name="Identifier Prefix" map-to="def:warning" />
   </styles>
 
   <definitions>
diff --git a/data/language-specs/html.lang b/data/language-specs/html.lang
index 74ab6eb..5db6baa 100644
--- a/data/language-specs/html.lang
+++ b/data/language-specs/html.lang
@@ -17,12 +17,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="html" _name="HTML" version="2.0" _section="Markup">
+<language id="html" name="HTML" version="2.0" _section="Markup">
   <metadata>
     <property name="mimetypes">text/html</property>
     <property name="globs">*.html;*.htm</property>
@@ -31,18 +30,18 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="xml:comment"/>
-    <style id="tag" _name="Tag" map-to="xml:element-name"/>
-    <style id="attrib-name" _name="Attribute Name" map-to="xml:attribute-name"/>
-    <style id="attrib-value" _name="Attribute Value" map-to="xml:attribute-value"/>
-    <style id="dtd" _name="DTD" map-to="xml:doctype"/>
-    <style id="error" _name="Error" map-to="xml:error"/>
-    <style id="title" _name="Page title" map-to="def:heading0"/>
-    <style id="h1" _name="Heading level 1" map-to="def:heading1"/>
-    <style id="h2" _name="Heading level 2" map-to="def:heading2"/>
-    <style id="h3" _name="Heading level 3" map-to="def:heading3"/>
-    <style id="h4" _name="Heading level 4" map-to="def:heading4"/>
-    <style id="h5" _name="Heading level 5" map-to="def:heading5"/>
+    <style id="comment" name="Comment" map-to="xml:comment"/>
+    <style id="tag" name="Tag" map-to="xml:element-name"/>
+    <style id="attrib-name" name="Attribute Name" map-to="xml:attribute-name"/>
+    <style id="attrib-value" name="Attribute Value" map-to="xml:attribute-value"/>
+    <style id="dtd" name="DTD" map-to="xml:doctype"/>
+    <style id="error" name="Error" map-to="xml:error"/>
+    <style id="title" name="Page title" map-to="def:heading0"/>
+    <style id="h1" name="Heading level 1" map-to="def:heading1"/>
+    <style id="h2" name="Heading level 2" map-to="def:heading2"/>
+    <style id="h3" name="Heading level 3" map-to="def:heading3"/>
+    <style id="h4" name="Heading level 4" map-to="def:heading4"/>
+    <style id="h5" name="Heading level 5" map-to="def:heading5"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/idl-exelis.lang b/data/language-specs/idl-exelis.lang
index 8d1c10f..33ff8f6 100644
--- a/data/language-specs/idl-exelis.lang
+++ b/data/language-specs/idl-exelis.lang
@@ -13,26 +13,25 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="idl-exelis" _name="IDL-Exelis" version="2.0" _section="Scientific">
+<language id="idl-exelis" name="IDL-Exelis" version="2.0" _section="Scientific">
   <metadata>
     <property name="globs">*.pro</property>
     <property name="line-comment-start">;</property>
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="floating-point" _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="function" _name="Function" map-to="def:function"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="floating-point" name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="function" name="Function" map-to="def:function"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/idl.lang b/data/language-specs/idl.lang
index 09ac6c5..c1f3a93 100644
--- a/data/language-specs/idl.lang
+++ b/data/language-specs/idl.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="idl" _name="IDL" version="2.0" _section="Source">
+<language id="idl" name="IDL" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-idl</property>
     <property name="globs">*.idl</property>
@@ -29,11 +28,11 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="string" _name="String" map-to="def:string"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="string" name="String" map-to="def:string"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/imagej.lang b/data/language-specs/imagej.lang
index 54799cf..a7a5791 100644
--- a/data/language-specs/imagej.lang
+++ b/data/language-specs/imagej.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="imagej" _name="ImageJ" version="2.0" _section="Scientific">
+<language id="imagej" name="ImageJ" version="2.0" _section="Scientific">
   <metadata>
     <property name="globs">*.ijm</property>
     <property name="line-comment-start">//</property>
@@ -30,14 +29,14 @@
   </metadata>
 
   <styles>
-    <style id="builtin"           _name="Builtin"             map-to="def:builtin"/>
-    <style id="boolean"           _name="Boolean"             map-to="def:boolean"/>
-    <style id="command"           _name="Commands"            map-to="def:function"/>
-    <style id="storage-type"      _name="Storage Type"        map-to="def:type"/>
-    <style id="escape"            _name="Escaped Character"   map-to="def:special-char"/>
-    <style id="keyword"           _name="Keyword"             map-to="def:keyword"/>
-    <style id="operator"          _name="Operator"            map-to="def:operator"/>
-    <style id="string"            _name="String"              map-to="def:string"/>
+    <style id="builtin"           name="Builtin"             map-to="def:builtin"/>
+    <style id="boolean"           name="Boolean"             map-to="def:boolean"/>
+    <style id="command"           name="Commands"            map-to="def:function"/>
+    <style id="storage-type"      name="Storage Type"        map-to="def:type"/>
+    <style id="escape"            name="Escaped Character"   map-to="def:special-char"/>
+    <style id="keyword"           name="Keyword"             map-to="def:keyword"/>
+    <style id="operator"          name="Operator"            map-to="def:operator"/>
+    <style id="string"            name="String"              map-to="def:string"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/ini.lang b/data/language-specs/ini.lang
index e213851..ad28ef4 100644
--- a/data/language-specs/ini.lang
+++ b/data/language-specs/ini.lang
@@ -16,11 +16,10 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 -->
-<language id="ini" _name=".ini" version="2.0" _section="Other">
+<language id="ini" name=".ini" version="2.0" _section="Other">
   <metadata>
     <property 
name="mimetypes">text/x-ini-file;application/x-ini-file;text/x-systemd-unit;text/x-dbus-service</property>
     <property name="globs">*.ini</property>
@@ -28,14 +27,14 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="floating-point" _name="Floating Point" map-to="def:floating-point"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="decimal" _name="Decimal" map-to="def:decimal"/>
-    <style id="variable" _name="Variable" map-to="def:type"/>
-    <style id="non-standard-key" _name="Data Type" map-to="def:type"/>
-    <style id="boolean-value" _name="Boolean value" map-to="def:boolean"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="floating-point" name="Floating Point" map-to="def:floating-point"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="decimal" name="Decimal" map-to="def:decimal"/>
+    <style id="variable" name="Variable" map-to="def:type"/>
+    <style id="non-standard-key" name="Data Type" map-to="def:type"/>
+    <style id="boolean-value" name="Boolean value" map-to="def:boolean"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/j.lang b/data/language-specs/j.lang
index 2cd0463..44d3b5e 100644
--- a/data/language-specs/j.lang
+++ b/data/language-specs/j.lang
@@ -16,34 +16,33 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="j" _name="J" version="2.0" _section="Source">
+<language id="j" name="J" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.ijs</property>
     <property name="line-comment-start">NB\.</property>
   </metadata>
 
   <styles>
-    <style id="adverb" _name="Adverb" map-to="def:identifier" />
-    <style id="comment" _name="Comment" map-to="def:comment" />
-    <style id="conjunction" _name="Conjunction" map-to="def:identifier" />
-    <style id="control" _name="Control" map-to="def:keyword" />
-    <style id="error" _name="Error" map-to="def:error" />
-    <style id="exparg" _name="Explicit Argument" map-to="def:special-char" />
-    <style id="global" _name="Global" map-to="def:type" />
-    <style id="labtext" _name="Lab Text" map-to="def:preprocessor" />
-    <style id="local" _name="Local" map-to="def:type" />
-    <style id="noun" _name="Noun" map-to="def:special-constant" />
-    <style id="noundef" _name="Explicit Noun Definition" map-to="def:string" />
-    <style id="number" _name="Number" map-to="def:decimal" />
-    <style id="parens" _name="Parens" map-to="def:statement" />
-    <style id="primitive" _name="Primitive" map-to="def:identifier" />
-    <style id="string" _name="String" map-to="def:string" />
-    <style id="verb"  _name="Verb" map-to="def:identifier" />
+    <style id="adverb" name="Adverb" map-to="def:identifier" />
+    <style id="comment" name="Comment" map-to="def:comment" />
+    <style id="conjunction" name="Conjunction" map-to="def:identifier" />
+    <style id="control" name="Control" map-to="def:keyword" />
+    <style id="error" name="Error" map-to="def:error" />
+    <style id="exparg" name="Explicit Argument" map-to="def:special-char" />
+    <style id="global" name="Global" map-to="def:type" />
+    <style id="labtext" name="Lab Text" map-to="def:preprocessor" />
+    <style id="local" name="Local" map-to="def:type" />
+    <style id="noun" name="Noun" map-to="def:special-constant" />
+    <style id="noundef" name="Explicit Noun Definition" map-to="def:string" />
+    <style id="number" name="Number" map-to="def:decimal" />
+    <style id="parens" name="Parens" map-to="def:statement" />
+    <style id="primitive" name="Primitive" map-to="def:identifier" />
+    <style id="string" name="String" map-to="def:string" />
+    <style id="verb"  name="Verb" map-to="def:identifier" />
   </styles>
 
   <definitions>
diff --git a/data/language-specs/jade.lang b/data/language-specs/jade.lang
index 5784cde..1598f56 100644
--- a/data/language-specs/jade.lang
+++ b/data/language-specs/jade.lang
@@ -17,27 +17,26 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="jade" _name="Jade" version="2.0" _section="Markup">
+<language id="jade" name="Jade" version="2.0" _section="Markup">
   <metadata>
     <property name="globs">*.jade;*.pug</property>
     <property name="line-comment-start">//</property>
   </metadata>
 
   <styles>
-    <style id="comment"                 _name="Comment"                 map-to="def:comment"/>
-    <style id="doctype"                 _name="DOCTYPE"                 map-to="def:preprocessor"/>
-    <style id="processing-instruction"  _name="Processing instruction"  map-to="def:preprocessor"/>
-    <style id="element-name"            _name="Element name"            map-to="def:identifier"/>
-    <style id="attribute-name"          _name="Attribute name"          map-to="def:type"/>
-    <style id="attribute-value"         _name="Attribute value"         map-to="def:string"/>
-    <style id="tags"                    _name="Tags"                    map-to="def:keyword"/>
-    <style id="entity"                  _name="Entity"                  map-to="def:preprocessor"/>
-    <style id="error"                   _name="Error"                   map-to="def:error"/>
+    <style id="comment"                 name="Comment"                 map-to="def:comment"/>
+    <style id="doctype"                 name="DOCTYPE"                 map-to="def:preprocessor"/>
+    <style id="processing-instruction"  name="Processing instruction"  map-to="def:preprocessor"/>
+    <style id="element-name"            name="Element name"            map-to="def:identifier"/>
+    <style id="attribute-name"          name="Attribute name"          map-to="def:type"/>
+    <style id="attribute-value"         name="Attribute value"         map-to="def:string"/>
+    <style id="tags"                    name="Tags"                    map-to="def:keyword"/>
+    <style id="entity"                  name="Entity"                  map-to="def:preprocessor"/>
+    <style id="error"                   name="Error"                   map-to="def:error"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/java.lang b/data/language-specs/java.lang
index 4ad5a20..42c768d 100644
--- a/data/language-specs/java.lang
+++ b/data/language-specs/java.lang
@@ -17,12 +17,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="java" _name="Java" version="2.0" _section="Source">
+<language id="java" name="Java" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-java</property>
     <property name="globs">*.java</property>
@@ -32,22 +31,20 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"                   map-to="def:comment"/>
-    <style id="escaped-character" _name="Escaped Character"         map-to="def:special-char"/>
-    <style id="string"            _name="String"                    map-to="def:string"/>
-    <style id="char"              _name="Character"                 map-to="def:character"/>
-    <!-- Translators: refered to some specific keywords of the language that
-         allow to get external functionalities -->
-    <style id="external"          _name="External"                  map-to="def:preprocessor"/>
-    <style id="declaration"       _name="Declaration"               map-to="def:type"/>
-    <style id="storage-class"     _name="Storage Class"             map-to="def:type"/>
-    <style id="scope-declaration" _name="Scope Declaration"         map-to="def:type"/>
-    <style id="keyword"           _name="Keyword"                   map-to="def:keyword"/>
-    <style id="null-value"        _name="Null Value"                map-to="def:special-constant"/>
-    <style id="boolean"           _name="Boolean value"             map-to="def:boolean"/>
-    <style id="number"            _name="Number"                    map-to="def:decimal"/>
-    <style id="reserved"          _name="Future Reserved Keywords"  map-to="def:reserved"/>
-    <style id="type"              _name="Data Type"                 map-to="def:type"/>
+    <style id="comment"           name="Comment"                   map-to="def:comment"/>
+    <style id="escaped-character" name="Escaped Character"         map-to="def:special-char"/>
+    <style id="string"            name="String"                    map-to="def:string"/>
+    <style id="char"              name="Character"                 map-to="def:character"/>
+    <style id="external"          name="External"                  map-to="def:preprocessor"/>
+    <style id="declaration"       name="Declaration"               map-to="def:type"/>
+    <style id="storage-class"     name="Storage Class"             map-to="def:type"/>
+    <style id="scope-declaration" name="Scope Declaration"         map-to="def:type"/>
+    <style id="keyword"           name="Keyword"                   map-to="def:keyword"/>
+    <style id="null-value"        name="Null Value"                map-to="def:special-constant"/>
+    <style id="boolean"           name="Boolean value"             map-to="def:boolean"/>
+    <style id="number"            name="Number"                    map-to="def:decimal"/>
+    <style id="reserved"          name="Future Reserved Keywords"  map-to="def:reserved"/>
+    <style id="type"              name="Data Type"                 map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/javascript.lang b/data/language-specs/javascript.lang
index 99f8311..2d08149 100644
--- a/data/language-specs/javascript.lang
+++ b/data/language-specs/javascript.lang
@@ -19,12 +19,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="js" _name="JavaScript" version="2.0" _section="Script">
+<language id="js" name="JavaScript" version="2.0" _section="Script">
   <metadata>
     <property 
name="mimetypes">application/javascript;application/x-javascript;text/x-javascript;text/javascript;text/x-js</property>
     <property name="globs">*.js;*.node</property>
@@ -34,18 +33,18 @@
   </metadata>
 
   <styles>
-    <style id="escape"          _name="Escaped Character"        map-to="def:special-char"/>
-    <style id="null-value"      _name="Null Value"               map-to="def:special-constant"/>
-    <style id="undefined-value" _name="Undefined Value"          map-to="def:special-constant"/>
-    <style id="boolean"         _name="Boolean Value"            map-to="def:boolean"/>
-    <style id="keyword"         _name="Keyword"                  map-to="def:keyword"/>
-    <style id="type"            _name="Data Type"                map-to="def:type"/>
-    <style id="function"        _name="Function"                 map-to="def:builtin"/>
-    <style id="properties"      _name="Properties"               map-to="def:statement"/>
-    <style id="constructors"    _name="Constructors"             map-to="def:type"/>
-    <style id="future-words"    _name="Future Reserved Keywords" map-to="def:error"/>
-    <style id="string"          _name="String"                   map-to="def:string"/>
-    <style id="regex"           _name="Regular Expression"       map-to="def:string"/>
+    <style id="escape"          name="Escaped Character"        map-to="def:special-char"/>
+    <style id="null-value"      name="Null Value"               map-to="def:special-constant"/>
+    <style id="undefined-value" name="Undefined Value"          map-to="def:special-constant"/>
+    <style id="boolean"         name="Boolean Value"            map-to="def:boolean"/>
+    <style id="keyword"         name="Keyword"                  map-to="def:keyword"/>
+    <style id="type"            name="Data Type"                map-to="def:type"/>
+    <style id="function"        name="Function"                 map-to="def:builtin"/>
+    <style id="properties"      name="Properties"               map-to="def:statement"/>
+    <style id="constructors"    name="Constructors"             map-to="def:type"/>
+    <style id="future-words"    name="Future Reserved Keywords" map-to="def:error"/>
+    <style id="string"          name="String"                   map-to="def:string"/>
+    <style id="regex"           name="Regular Expression"       map-to="def:string"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/json.lang b/data/language-specs/json.lang
index 60fb9d4..aebb8f5 100644
--- a/data/language-specs/json.lang
+++ b/data/language-specs/json.lang
@@ -16,9 +16,8 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 -->
 <!--
  TODO:
@@ -34,14 +33,14 @@
   </metadata>
 
   <styles>
-    <style id="keyname"       _name="Key"                   map-to="def:constant"/>
-    <style id="special-char"  _name="Escaped Character"     map-to="js:escape"/>
-    <style id="string"        _name="String"                map-to="js:string"/>
-    <style id="null-value"    _name="Null Value"            map-to="js:null-value"/>
-    <style id="boolean"       _name="Boolean Value"         map-to="js:boolean"/>
-    <style id="error"         _name="Error"                 map-to="def:error"/>
-    <style id="decimal"       _name="Decimal"               map-to="def:decimal"/>
-    <style id="float"         _name="Floating point number" map-to="def:floating-point"/>
+    <style id="keyname"       name="Key"                   map-to="def:constant"/>
+    <style id="special-char"  name="Escaped Character"     map-to="js:escape"/>
+    <style id="string"        name="String"                map-to="js:string"/>
+    <style id="null-value"    name="Null Value"            map-to="js:null-value"/>
+    <style id="boolean"       name="Boolean Value"         map-to="js:boolean"/>
+    <style id="error"         name="Error"                 map-to="def:error"/>
+    <style id="decimal"       name="Decimal"               map-to="def:decimal"/>
+    <style id="float"         name="Floating point number" map-to="def:floating-point"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/julia.lang b/data/language-specs/julia.lang
index 3ced1bb..5c88b6f 100644
--- a/data/language-specs/julia.lang
+++ b/data/language-specs/julia.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="julia" _name="Julia" version="2.0" _section="Scientific" >
+<language id="julia" name="Julia" version="2.0" _section="Scientific" >
 
   <metadata>
     <property name="globs" >*.jl</property>
@@ -34,19 +33,19 @@
   https://git.gnome.org/browse/gtksourceview/tree/data/language-specs/def.lang
   -->
   <styles>
-    <style id="string"           _name="String"            map-to="def:string" />
-    <style id="character"        _name="Character"         map-to="def:character" />
-    <style id="number"           _name="Number"            map-to="def:number" />
-    <style id="boolean"          _name="Boolean"           map-to="def:boolean" />
-    <style id="math-constant"    _name="Math Constant"     map-to="def:constant" />
-    <style id="special-constant" _name="Special Constant"  map-to="def:special-constant" />
-    <style id="operator"         _name="Operator"          map-to="def:operator" />
-    <style id="keyword"          _name="Keyword"           map-to="def:keyword" />
-    <style id="macro"            _name="Macro"             map-to="def:keyword" />
-    <style id="external-command" _name="External Command"  map-to="def:constant" />
-    <style id="builtin-function" _name="Built-in Function" map-to="def:builtin" />
-    <style id="module"           _name="Module"            map-to="def:builtin" />
-    <style id="type"             _name="Type"              map-to="def:type" />
+    <style id="string"           name="String"            map-to="def:string" />
+    <style id="character"        name="Character"         map-to="def:character" />
+    <style id="number"           name="Number"            map-to="def:number" />
+    <style id="boolean"          name="Boolean"           map-to="def:boolean" />
+    <style id="math-constant"    name="Math Constant"     map-to="def:constant" />
+    <style id="special-constant" name="Special Constant"  map-to="def:special-constant" />
+    <style id="operator"         name="Operator"          map-to="def:operator" />
+    <style id="keyword"          name="Keyword"           map-to="def:keyword" />
+    <style id="macro"            name="Macro"             map-to="def:keyword" />
+    <style id="external-command" name="External Command"  map-to="def:constant" />
+    <style id="builtin-function" name="Built-in Function" map-to="def:builtin" />
+    <style id="module"           name="Module"            map-to="def:builtin" />
+    <style id="type"             name="Type"              map-to="def:type" />
   </styles>
 
   <definitions>
diff --git a/data/language-specs/language-specs.pot b/data/language-specs/language-specs.pot
index 7413654..7e1cb82 100644
--- a/data/language-specs/language-specs.pot
+++ b/data/language-specs/language-specs.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2017-10-28 09:17+0200\n"
+"POT-Creation-Date: 2018-01-14 11:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL li org>\n"
@@ -9,11 +9,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. (itstool) path: abnf.lang/language@_name
-#: abnf.lang:31
-msgid "ABNF"
-msgstr ""
-
 #. (itstool) path: abnf.lang/language@_section
 #. (itstool) path: actionscript.lang/language@_section
 #. (itstool) path: ada.lang/language@_section
@@ -40,6 +35,7 @@ msgstr ""
 #. (itstool) path: genie.lang/language@_section
 #. (itstool) path: glsl.lang/language@_section
 #. (itstool) path: go.lang/language@_section
+#. (itstool) path: groovy.lang/language@_section
 #. (itstool) path: haskell.lang/language@_section
 #. (itstool) path: haskell-literate.lang/language@_section
 #. (itstool) path: haxe.lang/language@_section
@@ -75,854 +71,71 @@ msgstr ""
 #. (itstool) path: vbnet.lang/language@_section
 #. (itstool) path: verilog.lang/language@_section
 #. (itstool) path: vhdl.lang/language@_section
-#: abnf.lang:31
-#: actionscript.lang:25
-#: ada.lang:26
-#: ansforth94.lang:25
-#: asp.lang:24
-#: automake.lang:24
-#: bennugd.lang:23
-#: bluespec.lang:22
-#: boo.lang:24
-#: cg.lang:24
-#: chdr.lang:25
-#: c.lang:25
-#: cobol.lang:27
-#: cpphdr.lang:25
-#: cpp.lang:25
-#: csharp.lang:27
-#: cuda.lang:23
-#: d.lang:30
-#: eiffel.lang:24
-#: erlang.lang:24
-#: forth.lang:24
-#: fortran.lang:25
-#: fsharp.lang:25
-#: genie.lang:24
-#: glsl.lang:31
-#: go.lang:25
-#: haskell.lang:25
-#: haskell-literate.lang:24
-#: haxe.lang:35
-#: idl.lang:24
-#: java.lang:25
-#: j.lang:24
+#: abnf.lang:30
+#: actionscript.lang:24
+#: ada.lang:25
+#: ansforth94.lang:24
+#: asp.lang:23
+#: automake.lang:23
+#: bennugd.lang:22
+#: bluespec.lang:21
+#: boo.lang:23
+#: cg.lang:23
+#: chdr.lang:24
+#: c.lang:24
+#: cobol.lang:26
+#: cpphdr.lang:24
+#: cpp.lang:24
+#: csharp.lang:26
+#: cuda.lang:22
+#: d.lang:29
+#: eiffel.lang:23
+#: erlang.lang:23
+#: forth.lang:23
+#: fortran.lang:24
+#: fsharp.lang:24
+#: genie.lang:23
+#: glsl.lang:30
+#: go.lang:24
+#: groovy.lang:24
+#: haskell.lang:24
+#: haskell-literate.lang:23
+#: haxe.lang:34
+#: idl.lang:23
+#: java.lang:24
+#: j.lang:23
 #: kotlin.lang:24
-#: lex.lang:25
-#: llvm.lang:23
-#: makefile.lang:23
-#: meson.lang:24
-#: nemerle.lang:24
-#: netrexx.lang:24
-#: objc.lang:24
-#: objj.lang:26
-#: ocaml.lang:27
-#: ooc.lang:24
-#: opal.lang:24
-#: opencl.lang:24
-#: pascal.lang:25
-#: pig.lang:27
-#: prolog.lang:24
-#: rust.lang:36
-#: scala.lang:25
-#: scheme.lang:24
-#: sml.lang:24
-#: sparql.lang:24
-#: sql.lang:24
+#: lex.lang:24
+#: llvm.lang:22
+#: makefile.lang:22
+#: meson.lang:23
+#: nemerle.lang:23
+#: netrexx.lang:23
+#: objc.lang:23
+#: objj.lang:25
+#: ocaml.lang:26
+#: ooc.lang:23
+#: opal.lang:23
+#: opencl.lang:23
+#: pascal.lang:24
+#: pig.lang:26
+#: prolog.lang:23
+#: rust.lang:35
+#: scala.lang:24
+#: scheme.lang:23
+#: sml.lang:23
+#: sparql.lang:23
+#: sql.lang:23
 #: swift.lang:24
-#: systemverilog.lang:22
-#: thrift.lang:21
-#: vala.lang:28
-#: vbnet.lang:24
-#: verilog.lang:24
-#: vhdl.lang:24
+#: systemverilog.lang:21
+#: thrift.lang:20
+#: vala.lang:27
+#: vbnet.lang:23
+#: verilog.lang:23
+#: vhdl.lang:23
 msgid "Source"
 msgstr ""
 
-#. (itstool) path: styles/style@_name
-#: abnf.lang:38
-#: actionscript.lang:35
-#: ada.lang:34
-#: ansforth94.lang:39
-#: asp.lang:32
-#: bennugd.lang:32
-#: boo.lang:34
-#: cg.lang:33
-#: c.lang:35
-#: cobol.lang:35
-#: csharp.lang:37
-#: def.lang:40
-#: d.lang:40
-#: dosbatch.lang:31
-#: dot.lang:34
-#: dtl.lang:34
-#: eiffel.lang:33
-#: erlang.lang:32
-#: fcl.lang:30
-#: forth.lang:34
-#: fortran.lang:33
-#: fsharp.lang:34
-#: gap.lang:32
-#: genie.lang:34
-#: go.lang:35
-#: gtkrc.lang:33
-#: haskell.lang:34
-#: haxe.lang:48
-#: html.lang:34
-#: idl-exelis.lang:28
-#: idl.lang:32
-#: ini.lang:31
-#: jade.lang:32
-#: java.lang:35
-#: j.lang:32
-#: latex.lang:33
-#: llvm.lang:30
-#: lua.lang:34
-#: matlab.lang:41
-#: modelica.lang:36
-#: nemerle.lang:34
-#: netrexx.lang:38
-#: nsis.lang:32
-#: ocaml.lang:36
-#: ocl.lang:41
-#: octave.lang:41
-#: ooc.lang:33
-#: opal.lang:34
-#: pascal.lang:33
-#: perl.lang:34
-#: php.lang:40
-#: pig.lang:41
-#: po.lang:32
-#: prolog.lang:34
-#: protobuf.lang:31
-#: rst.lang:36
-#: ruby.lang:36
-#: rust.lang:46
-#: scala.lang:38
-#: scheme.lang:32
-#: scilab.lang:31
-#: sh.lang:33
-#: sml.lang:32
-#: sql.lang:32
-#: sweave.lang:32
-#: t2t.lang:31
-#: texinfo.lang:33
-#: thrift.lang:30
-#: vala.lang:38
-#: vbnet.lang:32
-#: verilog.lang:34
-#: vhdl.lang:32
-#: xml.lang:35
-#: yaml.lang:31
-msgid "Comment"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: abnf.lang:39
-msgid "Rule Name"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: abnf.lang:40
-#: d.lang:50
-#: nemerle.lang:45
-msgid "Binary number"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: abnf.lang:41
-#: ada.lang:37
-#: bennugd.lang:39
-#: cg.lang:43
-#: c.lang:48
-#: csharp.lang:49
-#: csv.lang:31
-#: def.lang:67
-#: d.lang:49
-#: dtl.lang:42
-#: eiffel.lang:45
-#: erlang.lang:39
-#: fsharp.lang:37
-#: go.lang:45
-#: idl-exelis.lang:34
-#: nemerle.lang:44
-#: ocaml.lang:40
-#: ooc.lang:45
-#: opal.lang:40
-#: php.lang:55
-#: python3.lang:41
-#: python.lang:46
-#: ruby.lang:43
-msgid "Decimal number"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: abnf.lang:42
-#: bennugd.lang:40
-#: cg.lang:45
-#: c.lang:50
-#: csharp.lang:50
-#: d.lang:52
-#: dtl.lang:44
-#: eiffel.lang:46
-#: go.lang:47
-#: nemerle.lang:47
-#: ooc.lang:47
-#: php.lang:57
-msgid "Hexadecimal number"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: abnf.lang:43
-#: actionscript.lang:37
-#: ada.lang:35
-#: ansforth94.lang:43
-#: asp.lang:33
-#: bibtex.lang:34
-#: boo.lang:36
-#: c.lang:36
-#: cobol.lang:40
-#: csharp.lang:40
-#: css.lang:50
-#: csv.lang:34
-#: def.lang:57
-#: d.lang:42
-#: dosbatch.lang:32
-#: dtl.lang:37
-#: eiffel.lang:34
-#: erlang.lang:36
-#: forth.lang:35
-#: fortran.lang:34
-#: fsharp.lang:38
-#: gdb-log.lang:30
-#: genie.lang:36
-#: go.lang:37
-#: gtkrc.lang:34
-#: haskell.lang:39
-#: haxe.lang:55
-#: idl-exelis.lang:32
-#: idl.lang:36
-#: imagej.lang:40
-#: ini.lang:33
-#: java.lang:37
-#: javascript.lang:47
-#: j.lang:45
-#: json.lang:39
-#: julia.lang:37
-#: llvm.lang:31
-#: lua.lang:35
-#: meson.lang:34
-#: modelica.lang:37
-#: nemerle.lang:38
-#: netrexx.lang:36
-#: nsis.lang:33
-#: objc.lang:37
-#: objj.lang:41
-#: ocaml.lang:41
-#: ocl.lang:42
-#: octave.lang:42
-#: ooc.lang:36
-#: opal.lang:37
-#: pascal.lang:34
-#: perl.lang:37
-#: php.lang:45
-#: po.lang:34
-#: prolog.lang:37
-#: protobuf.lang:37
-#: python3.lang:35
-#: python.lang:39
-#: ruby.lang:46
-#: rust.lang:47
-#: scala.lang:39
-#: scheme.lang:34
-#: scilab.lang:33
-#: sh.lang:35
-#: sml.lang:36
-#: sql.lang:34
-#: texinfo.lang:36
-#: thrift.lang:33
-#: vala.lang:41
-#: vbnet.lang:33
-#: verilog.lang:35
-#: vhdl.lang:33
-#: yaml.lang:32
-msgid "String"
-msgstr ""
-
-#. (itstool) path: actionscript.lang/language@_name
-#: actionscript.lang:25
-msgid "ActionScript"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: actionscript.lang:36
-#: cg.lang:34
-#: c.lang:54
-#: cobol.lang:43
-#: csharp.lang:38
-#: css.lang:48
-#: def.lang:102
-#: d.lang:41
-#: dot.lang:35
-#: dtl.lang:35
-#: go.lang:36
-#: haxe.lang:62
-#: html.lang:39
-#: jade.lang:40
-#: j.lang:35
-#: json.lang:42
-#: nemerle.lang:35
-#: ocaml.lang:53
-#: ooc.lang:34
-#: opal.lang:36
-#: perl.lang:48
-#: php.lang:41
-#: prolog.lang:40
-#: rust.lang:57
-#: scala.lang:36
-#: vala.lang:39
-#: verilog.lang:38
-#: xml.lang:45
-msgid "Error"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: actionscript.lang:38
-#: haxe.lang:49
-#: java.lang:41
-#: ooc.lang:37
-#: scala.lang:37
-msgid "External"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: actionscript.lang:39
-#: haxe.lang:51
-#: java.lang:42
-#: ooc.lang:38
-#: scala.lang:41
-msgid "Declaration"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: actionscript.lang:40
-#: ada.lang:39
-#: cg.lang:40
-#: c.lang:44
-#: haxe.lang:52
-#: java.lang:43
-#: ooc.lang:39
-msgid "Storage Class"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: actionscript.lang:41
-#: java.lang:44
-#: ooc.lang:40
-msgid "Scope Declaration"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: actionscript.lang:42
-#: ada.lang:36
-#: ansforth94.lang:36
-#: asp.lang:35
-#: awk.lang:32
-#: bennugd.lang:36
-#: bluespec.lang:35
-#: boo.lang:41
-#: cg.lang:38
-#: c.lang:41
-#: cobol.lang:38
-#: cpp.lang:35
-#: csharp.lang:45
-#: css.lang:59
-#: cuda.lang:33
-#: def.lang:92
-#: d.lang:43
-#: dosbatch.lang:33
-#: dot.lang:36
-#: dtl.lang:38
-#: eiffel.lang:37
-#: erlang.lang:33
-#: fcl.lang:32
-#: forth.lang:37
-#: fortran.lang:36
-#: fsharp.lang:39
-#: gap.lang:34
-#: genie.lang:41
-#: glsl.lang:43
-#: go.lang:39
-#: gtkrc.lang:35
-#: haskell.lang:37
-#: haxe.lang:54
-#: idl-exelis.lang:31
-#: idl.lang:35
-#: imagej.lang:38
-#: ini.lang:34
-#: java.lang:45
-#: javascript.lang:41
-#: julia.lang:44
-#: lex.lang:35
-#: llvm.lang:32
-#: lua.lang:36
-#: matlab.lang:42
-#: modelica.lang:46
-#: nemerle.lang:39
-#: objc.lang:34
-#: objj.lang:37
-#: ocaml.lang:42
-#: ocl.lang:43
-#: octave.lang:48
-#: ooc.lang:41
-#: opal.lang:38
-#: opencl.lang:33
-#: pascal.lang:35
-#: perl.lang:38
-#: php.lang:48
-#: po.lang:36
-#: prolog.lang:36
-#: protobuf.lang:35
-#: python3.lang:33
-#: python.lang:37
-#: R.lang:34
-#: ruby.lang:39
-#: rust.lang:49
-#: scala.lang:43
-#: scheme.lang:35
-#: scilab.lang:34
-#: sh.lang:36
-#: sml.lang:33
-#: sparql.lang:37
-#: sql.lang:35
-#: systemverilog.lang:33
-#: tcl.lang:33
-#: texinfo.lang:37
-#: thrift.lang:32
-#: vala.lang:42
-#: vbnet.lang:35
-#: verilog.lang:42
-#: vhdl.lang:35
-msgid "Keyword"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: actionscript.lang:43
-#: boo.lang:43
-#: csharp.lang:47
-#: d.lang:46
-#: dtl.lang:39
-#: fsharp.lang:52
-#: genie.lang:43
-#: haxe.lang:58
-#: java.lang:46
-#: javascript.lang:38
-#: json.lang:40
-#: nemerle.lang:41
-#: objj.lang:42
-#: ooc.lang:42
-#: php.lang:52
-#: vala.lang:44
-msgid "Null Value"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: actionscript.lang:44
-#: ada.lang:38
-#: asp.lang:42
-#: bennugd.lang:41
-#: cg.lang:46
-#: c.lang:51
-#: csharp.lang:48
-#: def.lang:75
-#: dtl.lang:40
-#: fsharp.lang:50
-#: go.lang:48
-#: gtkrc.lang:40
-#: haxe.lang:57
-#: ini.lang:38
-#: java.lang:47
-#: llvm.lang:38
-#: lua.lang:42
-#: nemerle.lang:42
-#: ocaml.lang:52
-#: ooc.lang:43
-#: opal.lang:39
-#: php.lang:53
-#: protobuf.lang:36
-#: R.lang:39
-#: ruby.lang:41
-#: rust.lang:51
-#: sml.lang:40
-#: vala.lang:43
-#: vbnet.lang:38
-#: vhdl.lang:37
-msgid "Boolean value"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: actionscript.lang:45
-#: asp.lang:43
-#: boo.lang:45
-#: cobol.lang:41
-#: def.lang:63
-#: desktop.lang:38
-#: forth.lang:39
-#: genie.lang:45
-#: haxe.lang:56
-#: java.lang:48
-#: j.lang:42
-#: julia.lang:39
-#: llvm.lang:39
-#: netrexx.lang:48
-#: prolog.lang:38
-#: rust.lang:53
-#: scala.lang:45
-#: vhdl.lang:40
-msgid "Number"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: actionscript.lang:46
-#: java.lang:49
-#: javascript.lang:46
-#: ooc.lang:48
-msgid "Future Reserved Keywords"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: actionscript.lang:47
-#: ada.lang:40
-#: asp.lang:40
-#: bennugd.lang:37
-#: boo.lang:39
-#: cg.lang:39
-#: c.lang:43
-#: cpp.lang:36
-#: csharp.lang:39
-#: cuda.lang:34
-#: d.lang:44
-#: eiffel.lang:38
-#: forth.lang:38
-#: fortran.lang:40
-#: fsharp.lang:42
-#: genie.lang:39
-#: glsl.lang:42
-#: go.lang:40
-#: gtkrc.lang:37
-#: haskell.lang:38
-#: haxe.lang:59
-#: idl-exelis.lang:29
-#: idl.lang:33
-#: ini.lang:37
-#: java.lang:50
-#: javascript.lang:42
-#: llvm.lang:37
-#: nemerle.lang:40
-#: objc.lang:35
-#: objj.lang:38
-#: ocaml.lang:45
-#: ocl.lang:45
-#: ooc.lang:49
-#: opal.lang:41
-#: opencl.lang:34
-#: pascal.lang:37
-#: php.lang:51
-#: pig.lang:36
-#: protobuf.lang:34
-#: rust.lang:50
-#: scala.lang:47
-#: sml.lang:34
-#: sparql.lang:34
-#: sql.lang:38
-#: thrift.lang:31
-#: vala.lang:40
-#: vbnet.lang:36
-msgid "Data Type"
-msgstr ""
-
-#. (itstool) path: ada.lang/language@_name
-#: ada.lang:26
-msgid "Ada"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ada.lang:41
-#: asp.lang:34
-#: bennugd.lang:33
-#: cg.lang:35
-#: c.lang:37
-#: csharp.lang:46
-#: forth.lang:36
-#: fortran.lang:41
-#: fsharp.lang:51
-#: glsl.lang:41
-#: haskell.lang:33
-#: haxe.lang:50
-#: idl-exelis.lang:30
-#: idl.lang:34
-#: nemerle.lang:36
-#: objj.lang:39
-#: pascal.lang:38
-#: vbnet.lang:34
-msgid "Preprocessor"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ada.lang:42
-msgid "Arbitrary base number"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ada.lang:43
-#: csharp.lang:51
-#: verilog.lang:46
-#: vhdl.lang:39
-msgid "Real number"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ada.lang:44
-#: cg.lang:41
-#: c.lang:46
-#: csharp.lang:42
-#: dtl.lang:36
-#: eiffel.lang:42
-#: fortran.lang:44
-#: fsharp.lang:49
-#: go.lang:42
-#: haskell.lang:41
-#: haxe.lang:63
-#: imagej.lang:37
-#: java.lang:36
-#: javascript.lang:37
-#: json.lang:38
-#: lua.lang:37
-#: netrexx.lang:35
-#: ocaml.lang:51
-#: ooc.lang:35
-#: php.lang:44
-#: prolog.lang:41
-#: python3.lang:36
-#: python.lang:40
-#: ruby.lang:35
-#: scala.lang:40
-#: sml.lang:37
-#: texinfo.lang:34
-#: vala.lang:49
-#: verilog.lang:37
-msgid "Escaped Character"
-msgstr ""
-
-#. (itstool) path: ansforth94.lang/language@_name
-#: ansforth94.lang:25
-msgid "ANS-Forth94"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ansforth94.lang:37
-msgid "Obsolete Keyword"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ansforth94.lang:40
-msgid "Alert"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ansforth94.lang:41
-#: c.lang:40
-#: csharp.lang:41
-#: def.lang:55
-#: erlang.lang:37
-#: gap.lang:33
-#: go.lang:38
-#: haskell.lang:40
-#: java.lang:38
-#: julia.lang:38
-#: nemerle.lang:37
-#: netrexx.lang:37
-#: rust.lang:48
-#: sml.lang:35
-#: vhdl.lang:34
-msgid "Character"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ansforth94.lang:42
-msgid "Word"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ansforth94.lang:44
-#: cmake.lang:34
-#: cobol.lang:39
-#: def.lang:53
-#: gtk-doc.lang:32
-#: libtool.lang:32
-#: ruby.lang:50
-msgid "Constant"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ansforth94.lang:45
-#: awk.lang:34
-#: cmake.lang:37
-#: cobol.lang:37
-#: haskell.lang:35
-#: ini.lang:36
-#: llvm.lang:35
-#: makefile.lang:31
-#: nsis.lang:34
-#: perl.lang:44
-#: php.lang:42
-#: pkgconfig.lang:31
-#: prolog.lang:35
-#: protobuf.lang:33
-#: ruby.lang:54
-#: sh.lang:37
-#: sparql.lang:44
-#: tcl.lang:32
-msgid "Variable"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ansforth94.lang:46
-msgid "Local Variable"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ansforth94.lang:47
-msgid "Single Number"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ansforth94.lang:48
-msgid "Double Number"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ansforth94.lang:49
-#: haskell.lang:42
-msgid "Float"
-msgstr ""
-
-#. (itstool) path: asp.lang/language@_name
-#: asp.lang:24
-msgid "ASP"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: asp.lang:36
-#: cg.lang:48
-#: changelog.lang:39
-#: css.lang:53
-#: def.lang:81
-#: gap.lang:35
-#: gdb-log.lang:29
-#: gtk-doc.lang:34
-#: idl-exelis.lang:35
-#: javascript.lang:43
-#: llvm.lang:33
-#: lua.lang:40
-#: scheme.lang:36
-#: scilab.lang:35
-#: sh.lang:34
-#: sparql.lang:35
-#: sql.lang:36
-msgid "Function"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: asp.lang:37
-#: bennugd.lang:35
-#: c.lang:42
-#: cmake.lang:35
-#: cobol.lang:42
-#: def.lang:90
-#: erlang.lang:34
-#: imagej.lang:39
-#: julia.lang:43
-#: meson.lang:33
-#: modelica.lang:38
-#: nsis.lang:31
-#: octave.lang:43
-#: perl.lang:43
-#: php.lang:50
-#: prolog.lang:39
-#: scala.lang:46
-#: sparql.lang:45
-msgid "Operator"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: asp.lang:38
-msgid "ASP Object"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: asp.lang:39
-msgid "VBScript and ADO constants"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: asp.lang:41
-#: def.lang:73
-#: vbnet.lang:37
-msgid "Special constant"
-msgstr ""
-
-#. (itstool) path: automake.lang/language@_name
-#: automake.lang:24
-msgid "Automake"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: automake.lang:39
-msgid "Automake Variable"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: automake.lang:40
-msgid "Primary"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: automake.lang:41
-msgid "Secondary"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: automake.lang:42
-msgid "Prefix"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: automake.lang:43
-msgid "Optional Target"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: automake.lang:44
-msgid "Built-in Target"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: automake.lang:45
-msgid "Other Keyword"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: automake.lang:46
-#: rst.lang:38
-msgid "Substitution"
-msgstr ""
-
-#. (itstool) path: awk.lang/language@_name
-#: awk.lang:24
-msgid "awk"
-msgstr ""
-
 #. (itstool) path: awk.lang/language@_section
 #. (itstool) path: dosbatch.lang/language@_section
 #. (itstool) path: javascript.lang/language@_section
@@ -935,81 +148,21 @@ msgstr ""
 #. (itstool) path: ruby.lang/language@_section
 #. (itstool) path: sh.lang/language@_section
 #. (itstool) path: tcl.lang/language@_section
-#: awk.lang:24
-#: dosbatch.lang:24
-#: javascript.lang:27
-#: lua.lang:24
-#: m4.lang:24
-#: perl.lang:26
-#: php.lang:29
-#: python3.lang:24
-#: python.lang:28
-#: ruby.lang:27
-#: sh.lang:25
-#: tcl.lang:24
+#: awk.lang:23
+#: dosbatch.lang:23
+#: javascript.lang:26
+#: lua.lang:23
+#: m4.lang:23
+#: perl.lang:25
+#: php.lang:28
+#: python3.lang:23
+#: python.lang:27
+#: ruby.lang:26
+#: sh.lang:24
+#: tcl.lang:23
 msgid "Script"
 msgstr ""
 
-#. (itstool) path: styles/style@_name
-#: awk.lang:33
-#: lex.lang:36
-msgid "Pattern"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: awk.lang:35
-#: boo.lang:46
-#: genie.lang:46
-#: glsl.lang:44
-#: go.lang:50
-#: netrexx.lang:47
-#: perl.lang:39
-#: python3.lang:46
-#: python.lang:51
-msgid "Builtin Function"
-msgstr ""
-
-#. (itstool) path: bennugd.lang/language@_name
-#: bennugd.lang:23
-msgid "BennuGD"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: bennugd.lang:34
-#: def.lang:79
-#: llvm.lang:36
-#: php.lang:43
-#: rust.lang:52
-msgid "Identifier"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: bennugd.lang:38
-#: cg.lang:42
-#: c.lang:47
-#: csv.lang:33
-#: def.lang:65
-#: d.lang:48
-#: dtl.lang:41
-#: erlang.lang:38
-#: go.lang:43
-#: idl-exelis.lang:33
-#: json.lang:44
-#: nemerle.lang:43
-#: ooc.lang:44
-#: php.lang:54
-#: python3.lang:40
-#: python.lang:45
-#: R.lang:41
-#: ruby.lang:42
-msgid "Floating point number"
-msgstr ""
-
-#. (itstool) path: bibtex.lang/language@_name
-#: bibtex.lang:24
-msgid "BibTeX"
-msgstr ""
-
 #. (itstool) path: bibtex.lang/language@_section
 #. (itstool) path: docbook.lang/language@_section
 #. (itstool) path: dtd.lang/language@_section
@@ -1029,194 +182,33 @@ msgstr ""
 #. (itstool) path: texinfo.lang/language@_section
 #. (itstool) path: xml.lang/language@_section
 #. (itstool) path: xslt.lang/language@_section
-#: bibtex.lang:24
-#: docbook.lang:24
-#: dtd.lang:24
+#: bibtex.lang:23
+#: docbook.lang:23
+#: dtd.lang:23
 #: dtl.lang:25
-#: gtk-doc.lang:25
-#: haddock.lang:24
-#: html.lang:25
-#: jade.lang:25
-#: latex.lang:25
-#: mallard.lang:23
-#: markdown.lang:26
-#: mediawiki.lang:23
-#: mxml.lang:24
-#: rst.lang:23
-#: sweave.lang:25
-#: t2t.lang:24
-#: texinfo.lang:25
-#: xml.lang:26
-#: xslt.lang:24
+#: gtk-doc.lang:24
+#: haddock.lang:23
+#: html.lang:24
+#: jade.lang:24
+#: latex.lang:24
+#: mallard.lang:22
+#: markdown.lang:25
+#: mediawiki.lang:22
+#: mxml.lang:23
+#: rst.lang:22
+#: sweave.lang:24
+#: t2t.lang:23
+#: texinfo.lang:24
+#: xml.lang:25
+#: xslt.lang:23
 msgid "Markup"
 msgstr ""
 
-#. (itstool) path: styles/style@_name
-#: bibtex.lang:32
-msgid "Entries"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: bibtex.lang:33
-msgid "Field"
-msgstr ""
-
-#. (itstool) path: bluespec.lang/language@_name
-#: bluespec.lang:22
-msgid "Bluespec SystemVerilog"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: bluespec.lang:31
-#: systemverilog.lang:32
-msgid "System Task"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: bluespec.lang:32
-msgid "Annotation"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: bluespec.lang:33
-#: rust.lang:55
-msgid "Attribute"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: bluespec.lang:34
-msgid "Import BVI"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: bluespec.lang:36
-#: gtk-doc.lang:33
-#: julia.lang:49
-#: systemverilog.lang:34
-#: verilog.lang:44
-#: vhdl.lang:36
-msgid "Type"
-msgstr ""
-
-#. (itstool) path: boo.lang/language@_name
-#: boo.lang:24
-msgid "Boo"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: boo.lang:35
-#: genie.lang:35
-#: python3.lang:34
-#: python.lang:38
-msgid "Multiline string"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: boo.lang:37
-#: genie.lang:37
-#: javascript.lang:48
-#: perl.lang:47
-#: ruby.lang:57
-#: vala.lang:48
-msgid "Regular Expression"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: boo.lang:38
-#: genie.lang:38
-#: sparql.lang:38
-#: xml.lang:44
-#: xslt.lang:34
-msgid "Namespace"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: boo.lang:40
-#: genie.lang:40
-msgid "Definition"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: boo.lang:42
-#: genie.lang:42
-#: python3.lang:38
-#: python.lang:43
-#: ruby.lang:52
-msgid "Special Variable"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: boo.lang:44
-#: desktop.lang:39
-#: d.lang:47
-#: genie.lang:44
-#: imagej.lang:34
-#: julia.lang:40
-#: libtool.lang:33
-#: meson.lang:35
-#: modelica.lang:42
-#: objj.lang:36
-#: octave.lang:46
-#: python3.lang:39
-#: python.lang:44
-#: scheme.lang:33
-#: scilab.lang:36
-#: sparql.lang:39
-#: yaml.lang:39
-msgid "Boolean"
-msgstr ""
-
 #. (itstool) path: cg.lang/language@_name
-#: cg.lang:24
+#: cg.lang:23
 msgid "CG Shader Language"
 msgstr ""
 
-#. (itstool) path: styles/style@_name
-#: cg.lang:36
-msgid "Bindings"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: cg.lang:37
-#: c.lang:39
-#: fortran.lang:43
-#: objj.lang:40
-msgid "Included File"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: cg.lang:44
-#: c.lang:49
-#: d.lang:51
-#: dtl.lang:43
-#: go.lang:46
-#: nemerle.lang:46
-#: ooc.lang:46
-#: php.lang:56
-msgid "Octal number"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: cg.lang:47
-msgid "Swizzle operator"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: cg.lang:49
-#: erlang.lang:41
-#: imagej.lang:33
-#: matlab.lang:43
-#: modelica.lang:47
-#: octave.lang:50
-#: ruby.lang:49
-msgid "Builtin"
-msgstr ""
-
-#. (itstool) path: changelog.lang/language@_name
-#: changelog.lang:25
-msgid "ChangeLog"
-msgstr ""
-
 #. (itstool) path: changelog.lang/language@_section
 #. (itstool) path: cmake.lang/language@_section
 #. (itstool) path: css.lang/language@_section
@@ -1238,638 +230,54 @@ msgstr ""
 #. (itstool) path: protobuf.lang/language@_section
 #. (itstool) path: puppet.lang/language@_section
 #. (itstool) path: rpmspec.lang/language@_section
-#. (itstool) path: styles/style@_name
 #. (itstool) path: yacc.lang/language@_section
 #. (itstool) path: yaml.lang/language@_section
-#: changelog.lang:25
-#: cmake.lang:24
-#: css.lang:39
-#: csv.lang:24
-#: desktop.lang:25
-#: diff.lang:24
-#: dot.lang:24
-#: dpatch.lang:24
-#: gdb-log.lang:19
-#: gtkrc.lang:25
-#: ini.lang:23
-#: json.lang:30
-#: libtool.lang:24
+#: changelog.lang:24
+#: cmake.lang:23
+#: css.lang:38
+#: csv.lang:23
+#: desktop.lang:24
+#: diff.lang:23
+#: dot.lang:23
+#: dpatch.lang:23
+#: gdb-log.lang:18
+#: gtkrc.lang:24
+#: ini.lang:22
+#: json.lang:29
+#: libtool.lang:23
 #: logcat.lang:23
-#: nsis.lang:24
-#: ocl.lang:33
-#: pkgconfig.lang:24
-#: po.lang:24
+#: nsis.lang:23
+#: ocl.lang:32
+#: pkgconfig.lang:23
+#: po.lang:23
 #: protobuf.lang:21
-#: puppet.lang:24
+#: puppet.lang:23
 #: rpmspec.lang:24
-#: scala.lang:49
-#: yacc.lang:24
-#: yaml.lang:22
+#: yacc.lang:23
+#: yaml.lang:21
 msgid "Other"
 msgstr ""
 
-#. (itstool) path: styles/style@_name
-#: changelog.lang:33
-#: rpmspec.lang:43
-msgid "Date"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: changelog.lang:35
-msgid "Name"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: changelog.lang:36
-msgid "E-mail address"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: changelog.lang:37
-msgid "File"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: changelog.lang:38
-#: rst.lang:34
-msgid "Bullet"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: changelog.lang:40
-msgid "Release"
-msgstr ""
-
 #. (itstool) path: chdr.lang/language@_name
-#: chdr.lang:25
+#: chdr.lang:24
 msgid "C/ObjC Header"
 msgstr ""
 
-#. (itstool) path: c.lang/language@_name
-#: c.lang:25
-msgid "C"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: c.lang:38
-#: cpp.lang:37
-#: objc.lang:36
-#: opal.lang:35
-msgid "Common Defines"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: c.lang:45
-#: genie.lang:47
-#: go.lang:41
-#: verilog.lang:36
-msgid "printf Conversion"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: c.lang:52
-msgid "Standard stream"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: c.lang:53
-msgid "Signal name"
-msgstr ""
-
-#. (itstool) path: cmake.lang/language@_name
-#: cmake.lang:24
-msgid "CMake"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: cmake.lang:31
-#: meson.lang:32
-msgid "Builtin Command"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: cmake.lang:32
-msgid "Deprecated Builtin Command"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: cmake.lang:33
-#: glsl.lang:46
-msgid "Builtin Variable"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: cmake.lang:36
-msgid "Control Keyword"
-msgstr ""
-
-#. (itstool) path: cobol.lang/language@_name
-#: cobol.lang:27
-msgid "COBOL"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: cobol.lang:36
-#: def.lang:88
-#: protobuf.lang:32
-msgid "Statement"
-msgstr ""
-
 #. (itstool) path: cpphdr.lang/language@_name
-#: cpphdr.lang:25
+#: cpphdr.lang:24
 msgid "C++ Header"
 msgstr ""
 
-#. (itstool) path: cpp.lang/language@_name
-#: cpp.lang:25
-msgid "C++"
-msgstr ""
-
-#. (itstool) path: csharp.lang/language@_name
-#: csharp.lang:27
-msgid "C#"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: csharp.lang:44
-#: po.lang:37
-msgid "String Format"
-msgstr ""
-
-#. (itstool) path: css.lang/language@_name
-#: css.lang:39
-msgid "CSS"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: css.lang:49
-msgid "Others 2"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: css.lang:51
-msgid "Color"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: css.lang:52
-msgid "Others 3"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: css.lang:55
-#: fcl.lang:34
-#: fortran.lang:39
-#: gap.lang:36
-#: gtkrc.lang:36
-#: haskell.lang:43
-#: ini.lang:35
-#: json.lang:43
-#: modelica.lang:43
-#: pascal.lang:36
-#: sml.lang:39
-#: sql.lang:37
-msgid "Decimal"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: css.lang:56
-msgid "Dimension"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: css.lang:57
-msgid "Property Value"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: css.lang:58
-msgid "at-rules"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: css.lang:60
-msgid "ID Selector"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: css.lang:61
-msgid "Class Selector"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: css.lang:62
-msgid "Tag Name Selector"
-msgstr ""
-
-#. (itstool) path: csv.lang/language@_name
-#: csv.lang:24
-msgid "CSV"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: csv.lang:32
-msgid "Escaped character"
-msgstr ""
-
-#. (itstool) path: cuda.lang/language@_name
-#: cuda.lang:23
-msgid "CUDA"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: cuda.lang:35
-msgid "Global Functions"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: cuda.lang:36
-msgid "Device Functions"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: cuda.lang:37
-msgid "Global Variables"
-msgstr ""
-
-#. (itstool) path: def.lang/language@_name
-#: def.lang:25
-msgid "Defaults"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:42
-msgid "Shebang"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:45
-msgid "Documentation comment"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:49
-msgid "Documentation comment element"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:61
-msgid "Special character (inside a string)"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:69
-#: python3.lang:42
-#: python.lang:47
-#: ruby.lang:44
-msgid "Base-N number"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:71
-#: python3.lang:43
-#: python.lang:48
-msgid "Complex number"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:84
-msgid "Built-in identifier"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:96
-#: modelica.lang:40
-#: octave.lang:44
-msgid "Data type"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:100
-msgid "Preprocessor directive"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:104
-msgid "Warning"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:106
-msgid "Reserved keyword"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:108
-msgid "Note (FIXME, TODO, XXX, etc.)"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:110
-msgid "Underlined"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:112
-msgid "Heading 0"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:113
-msgid "Heading 1"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:114
-msgid "Heading 2"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:115
-msgid "Heading 3"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:116
-msgid "Heading 4"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:117
-msgid "Heading 5"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: def.lang:118
-msgid "Heading 6"
-msgstr ""
-
-#. (itstool) path: desktop.lang/language@_name
-#: desktop.lang:25
-msgid ".desktop"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: desktop.lang:33
-msgid "Group"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: desktop.lang:36
-#: json.lang:37
-msgid "Key"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: desktop.lang:37
-msgid "Translation"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: desktop.lang:40
-msgid "Exec parameter"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: desktop.lang:41
-msgid "Encoding"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: desktop.lang:42
-msgid "Main Category"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: desktop.lang:43
-msgid "Additional Category"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: desktop.lang:44
-msgid "Reserved Category"
-msgstr ""
-
-#. (itstool) path: diff.lang/language@_name
-#: diff.lang:24
-msgid "Diff"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: diff.lang:31
-msgid "Added line"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: diff.lang:32
-msgid "Removed line"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: diff.lang:33
-msgid "Changed line"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: diff.lang:34
-msgid "Special case"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: diff.lang:35
-#: po.lang:33
-msgid "Location"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: diff.lang:36
-msgid "Ignore"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: diff.lang:37
-msgid ""
-msgstr ""
-
-#. (itstool) path: d.lang/language@_name
-#: d.lang:30
-msgid "D"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: d.lang:45
-msgid "Special Token"
-msgstr ""
-
-#. (itstool) path: docbook.lang/language@_name
-#: docbook.lang:24
-msgid "DocBook"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: docbook.lang:33
-msgid "Header Elements"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: docbook.lang:34
-msgid "Formatting Elements"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: docbook.lang:35
-msgid "GUI Elements"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: docbook.lang:36
-msgid "Structural Elements"
-msgstr ""
-
 #. (itstool) path: dosbatch.lang/language@_name
-#: dosbatch.lang:24
+#: dosbatch.lang:23
 msgid "DOS Batch"
 msgstr ""
 
-#. (itstool) path: styles/style@_name
-#: dosbatch.lang:34
-#: latex.lang:39
-#: latex.lang:40
-#: sweave.lang:33
-msgid "Command"
-msgstr ""
-
-#. (itstool) path: dot.lang/language@_name
-#: dot.lang:24
-msgid "Graphviz Dot"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: dot.lang:37
-#: jade.lang:36
-#: xml.lang:40
-msgid "Attribute name"
-msgstr ""
-
-#. (itstool) path: dpatch.lang/language@_name
-#: dpatch.lang:24
-msgid "DPatch"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: dpatch.lang:31
-msgid "Patch Start"
-msgstr ""
-
-#. (itstool) path: dtd.lang/language@_name
-#. (itstool) path: styles/style@_name
-#: dtd.lang:24
-#: html.lang:38
-msgid "DTD"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: dtd.lang:33
-msgid "entity"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: dtd.lang:34
-msgid "decl"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: dtd.lang:35
-msgid "error"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: dtd.lang:36
-msgid "Quoted Value"
-msgstr ""
-
 #. (itstool) path: dtl.lang/language@_name
 #: dtl.lang:25
 msgid "Django Template"
 msgstr ""
 
-#. (itstool) path: eiffel.lang/language@_name
-#: eiffel.lang:24
-msgid "Eiffel"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: eiffel.lang:35
-msgid "Debug"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: eiffel.lang:36
-msgid "Assertion"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: eiffel.lang:39
-msgid "Design by Contract"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: eiffel.lang:40
-msgid "Exception Handling"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: eiffel.lang:41
-#: ruby.lang:53
-msgid "Predefined Variable"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: eiffel.lang:43
-msgid "Void Value"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: eiffel.lang:44
-#: javascript.lang:40
-#: json.lang:41
-msgid "Boolean Value"
-msgstr ""
-
-#. (itstool) path: erlang.lang/language@_name
-#: erlang.lang:24
-msgid "Erlang"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: erlang.lang:35
-msgid "Atom"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: erlang.lang:40
-#: fsharp.lang:35
-#: modelica.lang:45
-#: ocaml.lang:38
-#: sml.lang:38
-#: verilog.lang:45
-#: vhdl.lang:38
-msgid "Base-N Integer"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: erlang.lang:42
-#: forth.lang:42
-#: systemverilog.lang:31
-#: verilog.lang:39
-msgid "Compiler Directive"
-msgstr ""
-
-#. (itstool) path: fcl.lang/language@_name
-#: fcl.lang:23
-msgid "FCL"
-msgstr ""
-
 #. (itstool) path: fcl.lang/language@_section
 #. (itstool) path: gap.lang/language@_section
 #. (itstool) path: idl-exelis.lang/language@_section
@@ -1882,1830 +290,41 @@ msgstr ""
 #. (itstool) path: R.lang/language@_section
 #. (itstool) path: scilab.lang/language@_section
 #: fcl.lang:23
-#: gap.lang:24
-#: idl-exelis.lang:21
-#: imagej.lang:24
-#: julia.lang:24
-#: matlab.lang:26
+#: gap.lang:23
+#: idl-exelis.lang:20
+#: imagej.lang:23
+#: julia.lang:23
+#: matlab.lang:25
 #: maxima.lang:24
-#: modelica.lang:26
-#: octave.lang:26
-#: R.lang:26
-#: scilab.lang:24
+#: modelica.lang:25
+#: octave.lang:25
+#: R.lang:25
+#: scilab.lang:23
 msgid "Scientific"
 msgstr ""
 
-#. (itstool) path: styles/style@_name
-#: fcl.lang:31
-#: fortran.lang:35
-#: ini.lang:32
-#: modelica.lang:44
-#: scilab.lang:32
-#: sql.lang:33
-msgid "Floating Point"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: fcl.lang:33
-msgid "Block"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: fcl.lang:35
-#: octave.lang:49
-#: scilab.lang:37
-msgid "Reserved Constant"
-msgstr ""
-
-#. (itstool) path: forth.lang/language@_name
-#: forth.lang:24
-msgid "Forth"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: forth.lang:40
-msgid "Debug Code"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: forth.lang:41
-msgid "Error Text"
-msgstr ""
-
-#. (itstool) path: fortran.lang/language@_name
-#: fortran.lang:25
-msgid "Fortran 95"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: fortran.lang:37
-msgid "Intrinsic function"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: fortran.lang:38
-msgid "BOZ Literal"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: fortran.lang:42
-msgid "OpenMP directives"
-msgstr ""
-
-#. (itstool) path: fsharp.lang/language@_name
-#: fsharp.lang:25
-msgid "F#"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: fsharp.lang:36
-#: ocaml.lang:39
-#: sml.lang:41
-msgid "Floating Point number"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: fsharp.lang:40
-#: ocaml.lang:43
-msgid "Type, module or object keyword"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: fsharp.lang:41
-#: ocaml.lang:44
-msgid "Builtin-function keyword"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: fsharp.lang:43
-#: ocaml.lang:46
-msgid "Labeled argument"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: fsharp.lang:44
-#: ocaml.lang:47
-msgid "Polymorphic Variant"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: fsharp.lang:45
-#: ocaml.lang:48
-msgid "Variant Constructor"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: fsharp.lang:47
-#: ocaml.lang:49
-msgid "Type Variable"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: fsharp.lang:48
-#: ocaml.lang:50
-msgid "Module Path"
-msgstr ""
-
-#. (itstool) path: gap.lang/language@_name
-#: gap.lang:24
-msgid "GAP"
-msgstr ""
-
 #. (itstool) path: gdb-log.lang/language@_name
-#: gdb-log.lang:19
+#: gdb-log.lang:18
 msgid "GDB Log"
 msgstr ""
 
-#. (itstool) path: styles/style@_name
-#: gdb-log.lang:25
-msgid "Thread Action"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: gdb-log.lang:26
-msgid "Thread Header"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: gdb-log.lang:27
-msgid "Frame Number"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: gdb-log.lang:28
-msgid "Address"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: gdb-log.lang:31
-msgid "Filename"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: gdb-log.lang:32
-msgid "Optimized Out"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: gdb-log.lang:33
-msgid "Incomplete Sequence"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: gdb-log.lang:34
-msgid "Prompt"
-msgstr ""
-
-#. (itstool) path: genie.lang/language@_name
-#: genie.lang:24
-msgid "Genie"
-msgstr ""
-
 #. (itstool) path: glsl.lang/language@_name
-#: glsl.lang:31
+#: glsl.lang:30
 msgid "OpenGL Shading Language"
 msgstr ""
 
-#. (itstool) path: styles/style@_name
-#: glsl.lang:45
-#: go.lang:49
-#: python3.lang:44
-#: python.lang:49
-msgid "Builtin Constant"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: glsl.lang:47
-msgid "Reserved Keywords"
-msgstr ""
-
-#. (itstool) path: go.lang/language@_name
-#: go.lang:25
-msgid "Go"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: go.lang:44
-msgid "Imaginary number"
-msgstr ""
-
-#. (itstool) path: gtk-doc.lang/language@_name
-#: gtk-doc.lang:25
-msgid "gtk-doc"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: gtk-doc.lang:27
-msgid "Inline Documentation Section"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: gtk-doc.lang:28
-#: python.lang:52
-msgid "Function Name"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: gtk-doc.lang:29
-msgid "Signal Name"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: gtk-doc.lang:30
-msgid "Property Name"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: gtk-doc.lang:31
-msgid "Parameter"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: gtk-doc.lang:35
-msgid "Return"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: gtk-doc.lang:36
-msgid "Since"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: gtk-doc.lang:37
-msgid "Deprecated"
-msgstr ""
-
-#. (itstool) path: gtkrc.lang/language@_name
-#: gtkrc.lang:25
-msgid "GtkRC"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: gtkrc.lang:38
-msgid "Widget State"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: gtkrc.lang:39
-msgid "Include directive"
-msgstr ""
-
-#. (itstool) path: haddock.lang/language@_name
-#: haddock.lang:24
-msgid "Haddock"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haddock.lang:27
-msgid "Inline Haddock Section"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haddock.lang:28
-msgid "Haddock Directive"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haddock.lang:29
-msgid "Hyperlinked Identifier"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haddock.lang:30
-msgid "Hyperlinked Module Name"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haddock.lang:31
-msgid "Escape"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haddock.lang:32
-#: markdown.lang:45
-#: rst.lang:32
-msgid "Emphasis"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haddock.lang:33
-msgid "Monospace"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haddock.lang:34
-msgid "Code Block"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haddock.lang:35
-msgid "Header Property"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haddock.lang:36
-msgid "Itemized list"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haddock.lang:37
-msgid "Enumerated list"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haddock.lang:38
-msgid "Definition list"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haddock.lang:39
-#: markdown.lang:40
-#: mediawiki.lang:33
-msgid "URL"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haddock.lang:40
-#: t2t.lang:41
-#: yaml.lang:33
-msgid "Anchor"
-msgstr ""
-
-#. (itstool) path: haskell.lang/language@_name
-#: haskell.lang:25
-msgid "Haskell"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haskell.lang:36
-#: ruby.lang:51
-msgid "Symbol"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haskell.lang:44
-msgid "Octal"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haskell.lang:45
-msgid "Hex"
-msgstr ""
-
-#. (itstool) path: haskell-literate.lang/language@_name
-#: haskell-literate.lang:24
-msgid "Literate Haskell"
-msgstr ""
-
-#. (itstool) path: haxe.lang/language@_name
-#: haxe.lang:35
-msgid "Haxe"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haxe.lang:53
-#: rust.lang:54
-msgid "Scope"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haxe.lang:60
-msgid "Metadata"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haxe.lang:61
-#: julia.lang:45
-#: rust.lang:56
-msgid "Macro"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: haxe.lang:64
-msgid "Identifier Prefix"
-msgstr ""
-
-#. (itstool) path: html.lang/language@_name
-#: html.lang:25
-msgid "HTML"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: html.lang:35
-#: xml.lang:43
-#: yaml.lang:34
-msgid "Tag"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: html.lang:36
-msgid "Attribute Name"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: html.lang:37
-#: markdown.lang:43
-msgid "Attribute Value"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: html.lang:40
-msgid "Page title"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: html.lang:41
-msgid "Heading level 1"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: html.lang:42
-msgid "Heading level 2"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: html.lang:43
-msgid "Heading level 3"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: html.lang:44
-msgid "Heading level 4"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: html.lang:45
-msgid "Heading level 5"
-msgstr ""
-
-#. (itstool) path: idl-exelis.lang/language@_name
-#: idl-exelis.lang:21
-msgid "IDL-Exelis"
-msgstr ""
-
-#. (itstool) path: idl.lang/language@_name
-#: idl.lang:24
-msgid "IDL"
-msgstr ""
-
-#. (itstool) path: imagej.lang/language@_name
-#: imagej.lang:24
-msgid "ImageJ"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: imagej.lang:35
-msgid "Commands"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: imagej.lang:36
-#: octave.lang:45
-msgid "Storage Type"
-msgstr ""
-
-#. (itstool) path: ini.lang/language@_name
-#: ini.lang:23
-msgid ".ini"
-msgstr ""
-
-#. (itstool) path: jade.lang/language@_name
-#: jade.lang:25
-msgid "Jade"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: jade.lang:33
-#: xml.lang:36
-msgid "DOCTYPE"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: jade.lang:34
-#: xml.lang:38
-msgid "Processing instruction"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: jade.lang:35
-#: mxml.lang:32
-#: xml.lang:39
-msgid "Element name"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: jade.lang:37
-#: xml.lang:41
-msgid "Attribute value"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: jade.lang:38
-msgid "Tags"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: jade.lang:39
-#: xml.lang:42
-msgid "Entity"
-msgstr ""
-
-#. (itstool) path: java.lang/language@_name
-#: java.lang:25
-msgid "Java"
-msgstr ""
-
-#. (itstool) path: javascript.lang/language@_name
-#: javascript.lang:27
-msgid "JavaScript"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: javascript.lang:39
-msgid "Undefined Value"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: javascript.lang:44
-msgid "Properties"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: javascript.lang:45
-msgid "Constructors"
-msgstr ""
-
-#. (itstool) path: j.lang/language@_name
-#: j.lang:24
-msgid "J"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: j.lang:31
-msgid "Adverb"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: j.lang:33
-msgid "Conjunction"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: j.lang:34
-#: perl.lang:46
-msgid "Control"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: j.lang:36
-msgid "Explicit Argument"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: j.lang:37
-msgid "Global"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: j.lang:38
-msgid "Lab Text"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: j.lang:39
-msgid "Local"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: j.lang:40
-msgid "Noun"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: j.lang:41
-msgid "Explicit Noun Definition"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: j.lang:43
-msgid "Parens"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: j.lang:44
-msgid "Primitive"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: j.lang:46
-msgid "Verb"
-msgstr ""
-
-#. (itstool) path: julia.lang/language@_name
-#: julia.lang:24
-msgid "Julia"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: julia.lang:41
-msgid "Math Constant"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: julia.lang:42
-#: R.lang:38
-#: scala.lang:44
-msgid "Special Constant"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: julia.lang:46
-msgid "External Command"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: julia.lang:47
-msgid "Built-in Function"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: julia.lang:48
-msgid "Module"
-msgstr ""
-
-#. (itstool) path: latex.lang/language@_name
-#: latex.lang:25
-msgid "LaTeX"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: latex.lang:34
-#: latex.lang:36
-msgid "Math Mode"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: latex.lang:35
-msgid "Inline Math Mode"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: latex.lang:37
-msgid "Math Boundary"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: latex.lang:38
-#: texinfo.lang:41
-msgid "Include"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: latex.lang:41
-#: sweave.lang:34
-#: t2t.lang:44
-msgid "Verbatim"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: latex.lang:42
-msgid "Special Character"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: latex.lang:43
-msgid "Part Heading"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: latex.lang:44
-msgid "Chapter Heading"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: latex.lang:45
-msgid "Section Heading"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: latex.lang:46
-msgid "SubSection Heading"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: latex.lang:47
-msgid "SubSubSection Heading"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: latex.lang:48
-msgid "Paragraph Heading"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: latex.lang:49
-msgid "SubParagraph Heading"
-msgstr ""
-
-#. (itstool) path: lex.lang/language@_name
-#: lex.lang:25
-msgid "Lex"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: lex.lang:34
-msgid "Token"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: lex.lang:37
-msgid "Expression"
-msgstr ""
-
-#. (itstool) path: libtool.lang/language@_name
-#: libtool.lang:24
-msgid "libtool"
-msgstr ""
-
 #. (itstool) path: llvm.lang/language@_name
-#: llvm.lang:23
+#: llvm.lang:22
 msgid "LLVM IR"
 msgstr ""
 
-#. (itstool) path: styles/style@_name
-#: llvm.lang:34
-msgid "Constants"
-msgstr ""
-
-#. (itstool) path: lua.lang/language@_name
-#: lua.lang:24
-msgid "Lua"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: lua.lang:38
-msgid "Reserved Identifier"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: lua.lang:39
-#: markdown.lang:42
-msgid "Label"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: lua.lang:41
-#: ruby.lang:40
-msgid "Nil Constant"
-msgstr ""
-
-#. (itstool) path: m4.lang/language@_name
-#: m4.lang:24
-msgid "m4"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: m4.lang:32
-msgid "m4 Comment"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: m4.lang:33
-msgid "m4 Macro"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: m4.lang:34
-msgid "Autoconf Macro"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: m4.lang:35
-msgid "Obsolete Autoconf Macro"
-msgstr ""
-
-#. (itstool) path: makefile.lang/language@_name
-#: makefile.lang:23
-msgid "Makefile"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: makefile.lang:32
-msgid "Assignment Right Hand Side"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: makefile.lang:33
-msgid "Assignment Left Hand Side"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: makefile.lang:34
-msgid "targets"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: makefile.lang:35
-msgid "prereq"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: makefile.lang:36
-msgid "command"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: makefile.lang:39
-msgid "Trailing Tab"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: makefile.lang:40
-msgid "function"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: makefile.lang:41
-#: yacc.lang:35
-msgid "keyword"
-msgstr ""
-
-#. (itstool) path: mallard.lang/language@_name
-#: mallard.lang:23
-msgid "Mallard"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: mallard.lang:32
-msgid "Page Elements"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: mallard.lang:33
-msgid "Section Elements"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: mallard.lang:34
-msgid "Block Elements"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: mallard.lang:35
-msgid "Inline Elements"
-msgstr ""
-
-#. (itstool) path: markdown.lang/language@_name
-#: markdown.lang:26
-msgid "Markdown"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: markdown.lang:35
-#: rpmspec.lang:33
-#: rst.lang:31
-#: t2t.lang:34
-msgid "Header"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: markdown.lang:36
-msgid "Horizontal Rule"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: markdown.lang:37
-msgid "List Marker"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: markdown.lang:38
-#: rst.lang:39
-msgid "Code"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: markdown.lang:39
-msgid "Blockquote Marker"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: markdown.lang:41
-msgid "Link Text"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: markdown.lang:44
-msgid "Image Marker"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: markdown.lang:46
-#: mediawiki.lang:30
-#: rst.lang:33
-msgid "Strong Emphasis"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: markdown.lang:47
-msgid "Backslash Escape"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: markdown.lang:48
-msgid "Line Break"
-msgstr ""
-
-#. (itstool) path: matlab.lang/language@_name
-#: matlab.lang:26
-msgid "Matlab"
-msgstr ""
-
-#. (itstool) path: mediawiki.lang/language@_name
-#: mediawiki.lang:23
-msgid "MediaWiki"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: mediawiki.lang:31
-msgid "Light Emphasis"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: mediawiki.lang:32
-msgid "Signature"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: mediawiki.lang:34
-#: rst.lang:37
-msgid "Link"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: mediawiki.lang:35
-msgid "Symbol on a Link"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: mediawiki.lang:36
-msgid "Line"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: mediawiki.lang:37
-msgid "List"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: mediawiki.lang:38
-msgid "Magic Word"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: mediawiki.lang:39
-msgid "Symbol of a Table"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: mediawiki.lang:40
-msgid "Preformatted"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: mediawiki.lang:41
-msgid "Redirect"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: mediawiki.lang:42
-msgid "Title"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: mediawiki.lang:43
-msgid "Template"
-msgstr ""
-
-#. (itstool) path: meson.lang/language@_name
-#: meson.lang:24
-msgid "Meson"
-msgstr ""
-
-#. (itstool) path: modelica.lang/language@_name
-#: modelica.lang:26
-msgid "Modelica"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: modelica.lang:39
-msgid "Class type"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: modelica.lang:41
-msgid "Default Attribute"
-msgstr ""
-
-#. (itstool) path: mxml.lang/language@_name
-#: mxml.lang:24
-msgid "MXML"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: mxml.lang:33
-#: xml.lang:37
-msgid "CDATA delimiter"
-msgstr ""
-
-#. (itstool) path: nemerle.lang/language@_name
-#: nemerle.lang:24
-msgid "Nemerle"
-msgstr ""
-
-#. (itstool) path: netrexx.lang/language@_name
-#: netrexx.lang:24
-msgid "NetRexx"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: netrexx.lang:39
-msgid "Externals"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: netrexx.lang:40
-msgid "Options"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: netrexx.lang:41
-msgid "Data Types"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: netrexx.lang:42
-msgid "Special"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: netrexx.lang:43
-msgid "Visibility"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: netrexx.lang:44
-msgid "Modifiers"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: netrexx.lang:45
-msgid "Keywords"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: netrexx.lang:46
-msgid "Sub Keywords"
-msgstr ""
-
-#. (itstool) path: nsis.lang/language@_name
-#: nsis.lang:24
-msgid "NSIS"
-msgstr ""
-
-#. (itstool) path: objc.lang/language@_name
-#: objc.lang:24
-msgid "Objective-C"
-msgstr ""
-
-#. (itstool) path: objj.lang/language@_name
-#: objj.lang:26
-msgid "Objective-J"
-msgstr ""
-
-#. (itstool) path: ocaml.lang/language@_name
-#: ocaml.lang:27
-msgid "OCaml"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ocaml.lang:37
-msgid "Ocamldoc Comments"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ocaml.lang:54
-msgid "Standard Modules"
-msgstr ""
-
-#. (itstool) path: ocl.lang/language@_name
-#: ocl.lang:33
-msgid "OCL"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ocl.lang:44
-msgid "Type Operators"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ocl.lang:46
-msgid "Operation operator"
-msgstr ""
-
-#. (itstool) path: octave.lang/language@_name
-#: octave.lang:26
-msgid "Octave"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: octave.lang:47
-msgid "Package Manager"
-msgstr ""
-
-#. (itstool) path: ooc.lang/language@_name
-#: ooc.lang:24
-msgid "OOC"
-msgstr ""
-
-#. (itstool) path: opal.lang/language@_name
-#: opal.lang:24
-msgid "Opal"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: opal.lang:33
-#: python3.lang:32
-#: python.lang:36
-msgid "Module Handler"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: opal.lang:42
-msgid "Keysymbol"
-msgstr ""
-
-#. (itstool) path: opencl.lang/language@_name
-#: opencl.lang:24
-msgid "OpenCL"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: opencl.lang:35
-msgid "Global Function"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: opencl.lang:36
-msgid "Device Function"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: opencl.lang:37
-msgid "Device Cast"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: opencl.lang:38
-msgid "OpenCL Constant"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: opencl.lang:39
-msgid "Global Variable"
-msgstr ""
-
-#. (itstool) path: pascal.lang/language@_name
-#: pascal.lang:25
-msgid "Pascal"
-msgstr ""
-
-#. (itstool) path: perl.lang/language@_name
-#: perl.lang:26
-msgid "Perl"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: perl.lang:35
-msgid "Line Directive"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: perl.lang:36
-msgid "Include Statement"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: perl.lang:40
-#: php.lang:46
-#: ruby.lang:55
-msgid "Heredoc"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: perl.lang:41
-#: php.lang:47
-#: ruby.lang:56
-#: sh.lang:41
-msgid "Heredoc Bound"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: perl.lang:42
-msgid "System Command"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: perl.lang:45
-msgid "File Descriptor"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: perl.lang:49
-msgid "POD"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: perl.lang:50
-msgid "POD Escape"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: perl.lang:51
-msgid "POD keyword"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: perl.lang:52
-msgid "POD heading"
-msgstr ""
-
-#. (itstool) path: php.lang/language@_name
-#: php.lang:29
-msgid "PHP"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: php.lang:39
-msgid "Preprocessor tags"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: php.lang:49
-msgid "Common Function"
-msgstr ""
-
-#. (itstool) path: pig.lang/language@_name
-#: pig.lang:27
-msgid "Pig"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: pig.lang:37
-msgid "Reserved Words"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: pig.lang:38
-msgid "Built In Functions"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: pig.lang:39
-msgid "Boolean values"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: pig.lang:40
-#: yaml.lang:38
-msgid "Null"
-msgstr ""
-
-#. (itstool) path: pkgconfig.lang/language@_name
-#: pkgconfig.lang:24
-msgid "pkg-config"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: pkgconfig.lang:32
-msgid "Package Info"
-msgstr ""
-
 #. (itstool) path: po.lang/language@_name
-#: po.lang:24
+#: po.lang:23
 msgid "gettext translation"
 msgstr ""
 
-#. (itstool) path: styles/style@_name
-#: po.lang:35
-msgid "Fuzzy"
-msgstr ""
-
-#. (itstool) path: prolog.lang/language@_name
-#: prolog.lang:24
-msgid "Prolog"
-msgstr ""
-
-#. (itstool) path: puppet.lang/language@_name
-#: puppet.lang:24
-msgid "Puppet"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: puppet.lang:31
-msgid "Resources"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: puppet.lang:32
-msgid "Parameters"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: puppet.lang:33
-msgid "Metaparameters"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: puppet.lang:34
-#: R.lang:42
-msgid "Functions"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: puppet.lang:35
-msgid "Values"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: puppet.lang:36
-msgid "Variables"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: puppet.lang:37
-msgid "Class names"
-msgstr ""
-
-#. (itstool) path: python3.lang/language@_name
-#: python3.lang:24
-msgid "Python 3"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: python3.lang:37
-#: python.lang:41
-msgid "Format"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: python3.lang:45
-#: python.lang:50
-msgid "Builtin Object"
-msgstr ""
-
-#. (itstool) path: python.lang/language@_name
-#: python.lang:28
-msgid "Python"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: python.lang:42
-msgid "String Conversion"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: python.lang:53
-msgid "Class Name"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: python.lang:54
-msgid "Decorator"
-msgstr ""
-
-#. (itstool) path: R.lang/language@_name
-#: R.lang:26
-msgid "R"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: R.lang:35
-msgid "Reserved Class"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: R.lang:36
-msgid "Assignment Operator"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: R.lang:37
-msgid "Delimiter"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: R.lang:40
-#: verilog.lang:47
-msgid "Integer Number"
-msgstr ""
-
 #. (itstool) path: rpmspec.lang/language@_name
 #: rpmspec.lang:24
 msgid "RPM spec"
 msgstr ""
 
-#. (itstool) path: styles/style@_name
-#: rpmspec.lang:32
-msgid "Define"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: rpmspec.lang:34
-#: t2t.lang:35
-msgid "Section"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: rpmspec.lang:35
-msgid "Spec Macro"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: rpmspec.lang:36
-msgid "Directory Macro"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: rpmspec.lang:37
-msgid "Command Macro"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: rpmspec.lang:38
-msgid "Conditional Macro"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: rpmspec.lang:39
-msgid "Other Macro"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: rpmspec.lang:40
-msgid "Flow Conditional"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: rpmspec.lang:41
-msgid "RPM Variable"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: rpmspec.lang:42
-msgid "Switch"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: rpmspec.lang:44
-msgid "Email"
-msgstr ""
-
-#. (itstool) path: rst.lang/language@_name
-#: rst.lang:23
-msgid "reStructuredText"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: rst.lang:35
-#: yaml.lang:37
-msgid "Directive"
-msgstr ""
-
-#. (itstool) path: ruby.lang/language@_name
-#: ruby.lang:27
-msgid "Ruby"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ruby.lang:37
-msgid "Attribute Definition"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ruby.lang:38
-msgid "Module handler"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ruby.lang:45
-msgid "Numeric literal"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: ruby.lang:47
-#: sparql.lang:40
-msgid "Literal"
-msgstr ""
-
-#. (itstool) path: rust.lang/language@_name
-#: rust.lang:36
-msgid "Rust"
-msgstr ""
-
-#. (itstool) path: scala.lang/language@_name
-#: scala.lang:25
-msgid "Scala"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: scala.lang:42
-msgid "Modifier"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: scala.lang:48
-msgid "Built In"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: scala.lang:50
-msgid "XML Tag"
-msgstr ""
-
-#. (itstool) path: scheme.lang/language@_name
-#: scheme.lang:24
-msgid "Scheme"
-msgstr ""
-
-#. (itstool) path: scilab.lang/language@_name
-#: scilab.lang:24
-msgid "Scilab"
-msgstr ""
-
-#. (itstool) path: sh.lang/language@_name
-#: sh.lang:25
-msgid "sh"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: sh.lang:38
-msgid "Variable Definition"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: sh.lang:39
-#: texinfo.lang:35
-msgid "Others"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: sh.lang:40
-msgid "Common Commands"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: sh.lang:42
-msgid "Subshell"
-msgstr ""
-
-#. (itstool) path: sml.lang/language@_name
-#: sml.lang:24
-msgid "Standard ML"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: sml.lang:42
-msgid "Module name, Variant, etc"
-msgstr ""
-
-#. (itstool) path: sparql.lang/language@_name
-#: sparql.lang:24
-msgid "SPARQL"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: sparql.lang:33
-msgid "Class"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: sparql.lang:36
-msgid "Individual"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: sparql.lang:41
-msgid "Predicate"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: sparql.lang:42
-msgid "QName"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: sparql.lang:43
-msgid "IRI"
-msgstr ""
-
-#. (itstool) path: sql.lang/language@_name
-#: sql.lang:24
-msgid "SQL"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: sql.lang:39
-msgid "No idea what it is"
-msgstr ""
-
-#. (itstool) path: sweave.lang/language@_name
-#: sweave.lang:25
-msgid "Sweave"
-msgstr ""
-
-#. (itstool) path: systemverilog.lang/language@_name
-#: systemverilog.lang:22
-msgid "SystemVerilog"
-msgstr ""
-
-#. (itstool) path: t2t.lang/language@_name
-#: t2t.lang:24
-msgid "txt2tags"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: t2t.lang:32
-msgid "Option"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: t2t.lang:33
-msgid "Option Name"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: t2t.lang:36
-msgid "Section 1"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: t2t.lang:37
-msgid "Section 2"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: t2t.lang:38
-msgid "Section 3"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: t2t.lang:39
-msgid "Section 4"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: t2t.lang:40
-msgid "Section 5"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: t2t.lang:42
-msgid "Italic"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: t2t.lang:43
-msgid "Bold"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: t2t.lang:45
-msgid "Verbatim Block"
-msgstr ""
-
-#. (itstool) path: tcl.lang/language@_name
-#: tcl.lang:24
-msgid "Tcl"
-msgstr ""
-
-#. (itstool) path: texinfo.lang/language@_name
-#: texinfo.lang:25
-msgid "Texinfo"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: texinfo.lang:38
-msgid "Macros"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: texinfo.lang:39
-msgid "File Attributes"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: texinfo.lang:40
-msgid "Generated Content"
-msgstr ""
-
-#. (itstool) path: thrift.lang/language@_name
-#: thrift.lang:21
-msgid "Thrift"
-msgstr ""
-
-#. (itstool) path: vala.lang/language@_name
-#: vala.lang:28
-msgid "Vala"
-msgstr ""
-
-#. (itstool) path: vbnet.lang/language@_name
-#: vbnet.lang:24
-msgid "VB.NET"
-msgstr ""
-
-#. (itstool) path: verilog.lang/language@_name
-#: verilog.lang:24
-msgid "Verilog"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: verilog.lang:40
-msgid "IEEE System Task"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: verilog.lang:41
-msgid "LRM Additional System Task"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: verilog.lang:43
-msgid "Gate"
-msgstr ""
-
-#. (itstool) path: vhdl.lang/language@_name
-#: vhdl.lang:24
-msgid "VHDL"
-msgstr ""
-
-#. (itstool) path: xml.lang/language@_name
-#: xml.lang:26
-msgid "XML"
-msgstr ""
-
-#. (itstool) path: xslt.lang/language@_name
-#: xslt.lang:24
-msgid "XSLT"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: xslt.lang:33
-msgid "Element"
-msgstr ""
-
-#. (itstool) path: yacc.lang/language@_name
-#: yacc.lang:24
-msgid "Yacc"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: yacc.lang:36
-msgid "token type"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: yacc.lang:37
-msgid "rule"
-msgstr ""
-
-#. (itstool) path: yaml.lang/language@_name
-#: yaml.lang:22
-msgid "YAML"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: yaml.lang:30
-msgid "Block literal"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: yaml.lang:35
-msgid "Alias"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: yaml.lang:36
-msgid "Map key"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: yaml.lang:40
-msgid "Integer"
-msgstr ""
-
-#. (itstool) path: styles/style@_name
-#: yaml.lang:41
-msgid "Floating point"
-msgstr ""
-
diff --git a/data/language-specs/latex.lang b/data/language-specs/latex.lang
index 067e86e..593e4d6 100644
--- a/data/language-specs/latex.lang
+++ b/data/language-specs/latex.lang
@@ -17,12 +17,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="latex" _name="LaTeX" version="2.0" _section="Markup">
+<language id="latex" name="LaTeX" version="2.0" _section="Markup">
   <metadata>
     <property name="mimetypes">text/x-tex</property>
     <property name="globs">*.tex;*.ltx;*.sty;*.cls;*.dtx;*.ins;*.bbl</property>
@@ -30,23 +29,23 @@
   </metadata>
 
   <styles>
-    <style id="comment"            _name="Comment"              map-to="def:comment"/>
-    <style id="display-math"       _name="Math Mode"            map-to="def:string"/>
-    <style id="inline-math"        _name="Inline Math Mode"     map-to="latex:display-math"/>
-    <style id="math"               _name="Math Mode"            map-to="latex:display-math"/>
-    <style id="math-boundary"      _name="Math Boundary"        map-to="latex:display-math"/>
-    <style id="include"            _name="Include"              map-to="def:keyword"/>
-    <style id="common-commands"    _name="Command"              map-to="def:keyword"/>
-    <style id="command"            _name="Command"              map-to="def:keyword"/>
-    <style id="verbatim"           _name="Verbatim"             map-to="def:comment"/>
-    <style id="special-char"       _name="Special Character"    map-to="def:special-char"/>
-    <style id="part"               _name="Part Heading"          map-to="def:heading0"/>
-    <style id="chapter"            _name="Chapter Heading"       map-to="def:heading1"/>
-    <style id="section"            _name="Section Heading"       map-to="def:heading2"/>
-    <style id="subsection"         _name="SubSection Heading"    map-to="def:heading3"/>
-    <style id="subsubsection"      _name="SubSubSection Heading" map-to="def:heading4"/>
-    <style id="paragraph"          _name="Paragraph Heading"     map-to="def:heading5"/>
-    <style id="subparagraph"       _name="SubParagraph Heading"  map-to="def:heading6"/>
+    <style id="comment"            name="Comment"              map-to="def:comment"/>
+    <style id="display-math"       name="Math Mode"            map-to="def:string"/>
+    <style id="inline-math"        name="Inline Math Mode"     map-to="latex:display-math"/>
+    <style id="math"               name="Math Mode"            map-to="latex:display-math"/>
+    <style id="math-boundary"      name="Math Boundary"        map-to="latex:display-math"/>
+    <style id="include"            name="Include"              map-to="def:keyword"/>
+    <style id="common-commands"    name="Command"              map-to="def:keyword"/>
+    <style id="command"            name="Command"              map-to="def:keyword"/>
+    <style id="verbatim"           name="Verbatim"             map-to="def:comment"/>
+    <style id="special-char"       name="Special Character"    map-to="def:special-char"/>
+    <style id="part"               name="Part Heading"          map-to="def:heading0"/>
+    <style id="chapter"            name="Chapter Heading"       map-to="def:heading1"/>
+    <style id="section"            name="Section Heading"       map-to="def:heading2"/>
+    <style id="subsection"         name="SubSection Heading"    map-to="def:heading3"/>
+    <style id="subsubsection"      name="SubSubSection Heading" map-to="def:heading4"/>
+    <style id="paragraph"          name="Paragraph Heading"     map-to="def:heading5"/>
+    <style id="subparagraph"       name="SubParagraph Heading"  map-to="def:heading6"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/lex.lang b/data/language-specs/lex.lang
index 58f8c30..0651b34 100644
--- a/data/language-specs/lex.lang
+++ b/data/language-specs/lex.lang
@@ -16,13 +16,12 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
-<language id="lex" _name="Lex" _section="Source" version="2.0">
+<language id="lex" name="Lex" _section="Source" version="2.0">
   <metadata>
     <property name="globs">*.l;*.lex;*.flex</property>
     <property name="line-comment-start">//</property>
@@ -31,10 +30,10 @@
   </metadata>
 
   <styles>
-    <style id="token" _name="Token" map-to="def:keyword" />
-    <style id="keyword" _name="Keyword" map-to="def:keyword" />
-    <style id="regexp" _name="Pattern" map-to="def:identifier" />
-    <style id="expression" _name="Expression" map-to="def:type" />
+    <style id="token" name="Token" map-to="def:keyword" />
+    <style id="keyword" name="Keyword" map-to="def:keyword" />
+    <style id="regexp" name="Pattern" map-to="def:identifier" />
+    <style id="expression" name="Expression" map-to="def:type" />
   </styles>
 
   <definitions>
diff --git a/data/language-specs/libtool.lang b/data/language-specs/libtool.lang
index debe31f..3213c47 100644
--- a/data/language-specs/libtool.lang
+++ b/data/language-specs/libtool.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="libtool" _name="libtool" version="2.0" _section="Other">
+<language id="libtool" name="libtool" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/x-libtool</property>
     <property name="globs">*.la;*.lai;*.lo</property>
@@ -29,8 +28,8 @@
   </metadata>
 
   <styles>
-    <style id="constant" _name="Constant" map-to="def:constant"/>
-    <style id="boolean" _name="Boolean" map-to="libtool:constant"/>
+    <style id="constant" name="Constant" map-to="def:constant"/>
+    <style id="boolean" name="Boolean" map-to="libtool:constant"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/llvm.lang b/data/language-specs/llvm.lang
index 21caadb..d3192f9 100644
--- a/data/language-specs/llvm.lang
+++ b/data/language-specs/llvm.lang
@@ -15,9 +15,8 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 <language id="llvm" _name="LLVM IR" version="2.0" _section="Source">
@@ -27,16 +26,16 @@
   </metadata>
 
   <styles>
-    <style id="comment"     _name="Comment"       map-to="def:comment"/>
-    <style id="string"      _name="String"        map-to="def:string"/>
-    <style id="keyword"     _name="Keyword"       map-to="def:keyword"/>
-    <style id="function"    _name="Function"      map-to="def:function"/>
-    <style id="constant"    _name="Constants"     map-to="def:constant"/>
-    <style id="variable"    _name="Variable"      map-to="def:variable"/>
-    <style id="identifier"  _name="Identifier"    map-to="def:identifier"/>
-    <style id="type"        _name="Data Type"     map-to="def:type"/>
-    <style id="boolean"     _name="Boolean value" map-to="def:boolean"/>
-    <style id="number"      _name="Number"        map-to="def:decimal"/>
+    <style id="comment"     name="Comment"       map-to="def:comment"/>
+    <style id="string"      name="String"        map-to="def:string"/>
+    <style id="keyword"     name="Keyword"       map-to="def:keyword"/>
+    <style id="function"    name="Function"      map-to="def:function"/>
+    <style id="constant"    name="Constants"     map-to="def:constant"/>
+    <style id="variable"    name="Variable"      map-to="def:variable"/>
+    <style id="identifier"  name="Identifier"    map-to="def:identifier"/>
+    <style id="type"        name="Data Type"     map-to="def:type"/>
+    <style id="boolean"     name="Boolean value" map-to="def:boolean"/>
+    <style id="number"      name="Number"        map-to="def:decimal"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/lua.lang b/data/language-specs/lua.lang
index 89d24ec..fe81ecc 100644
--- a/data/language-specs/lua.lang
+++ b/data/language-specs/lua.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="lua" _name="Lua" version="2.0" _section="Script">
+<language id="lua" name="Lua" version="2.0" _section="Script">
   <metadata>
     <property name="mimetypes">text/x-lua</property>
     <property name="globs">*.lua</property>
@@ -31,15 +30,15 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="escape" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="reserved" _name="Reserved Identifier" map-to="def:keyword"/>
-    <style id="label" _name="Label" map-to="def:keyword"/>
-    <style id="function" _name="Function" map-to="def:function"/>
-    <style id="nil-value" _name="Nil Constant" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="escape" name="Escaped Character" map-to="def:special-char"/>
+    <style id="reserved" name="Reserved Identifier" map-to="def:keyword"/>
+    <style id="label" name="Label" map-to="def:keyword"/>
+    <style id="function" name="Function" map-to="def:function"/>
+    <style id="nil-value" name="Nil Constant" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/m4.lang b/data/language-specs/m4.lang
index 7188aad..978cbaf 100644
--- a/data/language-specs/m4.lang
+++ b/data/language-specs/m4.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="m4" _name="m4" _section="Script" version="2.0">
+<language id="m4" name="m4" _section="Script" version="2.0">
   <metadata>
     <property name="mimetypes">application/x-m4</property>
     <property name="globs">*.m4;configure.ac;configure.in</property>
@@ -29,10 +28,10 @@
   </metadata>
 
   <styles>
-    <style id="m4-comment" _name="m4 Comment" map-to="sh:comment"/>
-    <style id="m4-macro" _name="m4 Macro" map-to="def:keyword"/>
-    <style id="ac-macro" _name="Autoconf Macro" map-to="def:keyword"/>
-    <style id="ac-macro-obsolete" _name="Obsolete Autoconf Macro" map-to="def:error"/>
+    <style id="m4-comment" name="m4 Comment" map-to="sh:comment"/>
+    <style id="m4-macro" name="m4 Macro" map-to="def:keyword"/>
+    <style id="ac-macro" name="Autoconf Macro" map-to="def:keyword"/>
+    <style id="ac-macro-obsolete" name="Obsolete Autoconf Macro" map-to="def:error"/>
   </styles>
 
   <!--
diff --git a/data/language-specs/makefile.lang b/data/language-specs/makefile.lang
index a870766..a0cbd49 100644
--- a/data/language-specs/makefile.lang
+++ b/data/language-specs/makefile.lang
@@ -15,12 +15,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="makefile" _name="Makefile" version="2.0" _section="Source">
+<language id="makefile" name="Makefile" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-makefile</property>
     <property name="globs">[Mm]akefile;GNUmakefile;*.make;*.mak;*.mk</property>
@@ -28,17 +27,15 @@
   </metadata>
 
   <styles>
-    <style id="variable"        _name="Variable" map-to="def:type"/>
-    <style id="assignment-rhs"  _name="Assignment Right Hand Side"/>
-    <style id="assignment-lhs"  _name="Assignment Left Hand Side"/>
-    <style id="targets"         _name="targets" map-to="def:function"/>
-    <style id="prereq"          _name="prereq"/>
-    <style id="command"         _name="command"/>
-    <!-- Translators: Trailing Tabs refers to tabulation characters present at
-         the end of the line -->
-    <style id="trailing-tab"    _name="Trailing Tab"/>
-    <style id="function"        _name="function" map-to="def:function"/>
-    <style id="keyword"         _name="keyword" map-to="def:keyword"/>
+    <style id="variable"        name="Variable" map-to="def:type"/>
+    <style id="assignment-rhs"  name="Assignment Right Hand Side"/>
+    <style id="assignment-lhs"  name="Assignment Left Hand Side"/>
+    <style id="targets"         name="targets" map-to="def:function"/>
+    <style id="prereq"          name="prereq"/>
+    <style id="command"         name="command"/>
+    <style id="trailing-tab"    name="Trailing Tab"/>
+    <style id="function"        name="function" map-to="def:function"/>
+    <style id="keyword"         name="keyword" map-to="def:keyword"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/mallard.lang b/data/language-specs/mallard.lang
index 92a66ad..d8bd914 100644
--- a/data/language-specs/mallard.lang
+++ b/data/language-specs/mallard.lang
@@ -16,11 +16,10 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 -->
-<language id="mallard" _name="Mallard" version="2.0" _section="Markup">
+<language id="mallard" name="Mallard" version="2.0" _section="Markup">
 
   <metadata>
     <property name="globs">*.page</property>
@@ -29,10 +28,10 @@
   </metadata>
 
   <styles>
-    <style id="page"    _name="Page Elements"    map-to="def:identifier"/>
-    <style id="section" _name="Section Elements" map-to="def:identifier"/>
-    <style id="block"   _name="Block Elements"   map-to="def:identifier"/>
-    <style id="inline"  _name="Inline Elements"  map-to="def:identifier"/>
+    <style id="page"    name="Page Elements"    map-to="def:identifier"/>
+    <style id="section" name="Section Elements" map-to="def:identifier"/>
+    <style id="block"   name="Block Elements"   map-to="def:identifier"/>
+    <style id="inline"  name="Inline Elements"  map-to="def:identifier"/>
   </styles>
 
 <definitions>
diff --git a/data/language-specs/markdown.lang b/data/language-specs/markdown.lang
index a23c2bc..2ee8fbf 100644
--- a/data/language-specs/markdown.lang
+++ b/data/language-specs/markdown.lang
@@ -14,16 +14,15 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 <!-- Note: this language definition file adds support for Markdown syntax,
      described in the following websites:
      * (fr) <http://michelf.com/projets/php-markdown/syntaxe/>
      * (en) <http://daringfireball.net/projects/markdown/syntax> -->
-<language id="markdown" _name="Markdown" version="2.0" _section="Markup">
+<language id="markdown" name="Markdown" version="2.0" _section="Markup">
   <metadata>
     <property name="mimetypes">text/x-markdown</property>
     <property name="globs">*.markdown;*.md;*.mkd</property>
@@ -32,20 +31,20 @@
   </metadata>
 
   <styles>
-    <style id="header" _name="Header" map-to="def:type"/>
-    <style id="horizontal-rule" _name="Horizontal Rule" map-to="def:type"/>
-    <style id="list-marker" _name="List Marker" map-to="def:statement"/>
-    <style id="code" _name="Code" map-to="def:identifier"/>
-    <style id="blockquote-marker" _name="Blockquote Marker" map-to="def:shebang"/>
-    <style id="url" _name="URL" map-to="def:underlined"/>
-    <style id="link-text" _name="Link Text" map-to="def:comment"/>
-    <style id="label" _name="Label" map-to="def:preprocessor"/>
-    <style id="attribute-value" _name="Attribute Value" map-to="def:constant"/>
-    <style id="image-marker" _name="Image Marker" map-to="def:shebang"/>
-    <style id="emphasis" _name="Emphasis" map-to="def:doc-comment-element"/>
-    <style id="strong-emphasis" _name="Strong Emphasis" map-to="def:statement"/>
-    <style id="backslash-escape" _name="Backslash Escape" map-to="def:special-char"/>
-    <style id="line-break" _name="Line Break" map-to="def:note"/>
+    <style id="header" name="Header" map-to="def:type"/>
+    <style id="horizontal-rule" name="Horizontal Rule" map-to="def:type"/>
+    <style id="list-marker" name="List Marker" map-to="def:statement"/>
+    <style id="code" name="Code" map-to="def:identifier"/>
+    <style id="blockquote-marker" name="Blockquote Marker" map-to="def:shebang"/>
+    <style id="url" name="URL" map-to="def:underlined"/>
+    <style id="link-text" name="Link Text" map-to="def:comment"/>
+    <style id="label" name="Label" map-to="def:preprocessor"/>
+    <style id="attribute-value" name="Attribute Value" map-to="def:constant"/>
+    <style id="image-marker" name="Image Marker" map-to="def:shebang"/>
+    <style id="emphasis" name="Emphasis" map-to="def:doc-comment-element"/>
+    <style id="strong-emphasis" name="Strong Emphasis" map-to="def:statement"/>
+    <style id="backslash-escape" name="Backslash Escape" map-to="def:special-char"/>
+    <style id="line-break" name="Line Break" map-to="def:note"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/matlab.lang b/data/language-specs/matlab.lang
index 71f6c50..7125909 100644
--- a/data/language-specs/matlab.lang
+++ b/data/language-specs/matlab.lang
@@ -18,12 +18,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="matlab" _name="Matlab" version="2.0" _section="Scientific">
+<language id="matlab" name="Matlab" version="2.0" _section="Scientific">
   <metadata>
     <property name="mimetypes">text/x-matlab</property>
     <property name="globs">*.m</property>
@@ -38,9 +37,9 @@
   -->
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="builtin" _name="Builtin" map-to="def:builtin"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="builtin" name="Builtin" map-to="def:builtin"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/mediawiki.lang b/data/language-specs/mediawiki.lang
index e6d339d..ae394ab 100644
--- a/data/language-specs/mediawiki.lang
+++ b/data/language-specs/mediawiki.lang
@@ -15,32 +15,31 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="mediawiki" _name="MediaWiki" version="2.0" _section="Markup">
+<language id="mediawiki" name="MediaWiki" version="2.0" _section="Markup">
   <metadata>
     <property name="block-comment-start">&lt;!--</property>
     <property name="block-comment-end">--&gt;</property>
   </metadata>
 
   <styles>
-    <style id="strong-emphasis" _name="Strong Emphasis"   map-to="def:statement"/>
-    <style id="light-emphasis"  _name="Light Emphasis"    map-to="def:doc-comment-element"/>
-    <style id="signature"       _name="Signature"         map-to="def:statement"/>
-    <style id="url"             _name="URL"               map-to="def:underlined"/>
-    <style id="link"            _name="Link"              map-to="def:comment"/>
-    <style id="link-symbol"     _name="Symbol on a Link"  map-to="def:shebang"/>
-    <style id="line"            _name="Line"              map-to="def:type"/>
-    <style id="list"            _name="List"              map-to="def:statement"/>
-    <style id="magic-word"      _name="Magic Word"        map-to="def:statement"/>
-    <style id="table-symbol"    _name="Symbol of a Table" map-to="def:statement"/>
-    <style id="preformatted"    _name="Preformatted"      map-to="def:identifier"/>
-    <style id="redirect"        _name="Redirect"          map-to="def:statement"/>
-    <style id="title"           _name="Title"             map-to="def:type"/>
-    <style id="template"        _name="Template"          map-to="def:statement"/>
+    <style id="strong-emphasis" name="Strong Emphasis"   map-to="def:statement"/>
+    <style id="light-emphasis"  name="Light Emphasis"    map-to="def:doc-comment-element"/>
+    <style id="signature"       name="Signature"         map-to="def:statement"/>
+    <style id="url"             name="URL"               map-to="def:underlined"/>
+    <style id="link"            name="Link"              map-to="def:comment"/>
+    <style id="link-symbol"     name="Symbol on a Link"  map-to="def:shebang"/>
+    <style id="line"            name="Line"              map-to="def:type"/>
+    <style id="list"            name="List"              map-to="def:statement"/>
+    <style id="magic-word"      name="Magic Word"        map-to="def:statement"/>
+    <style id="table-symbol"    name="Symbol of a Table" map-to="def:statement"/>
+    <style id="preformatted"    name="Preformatted"      map-to="def:identifier"/>
+    <style id="redirect"        name="Redirect"          map-to="def:statement"/>
+    <style id="title"           name="Title"             map-to="def:type"/>
+    <style id="template"        name="Template"          map-to="def:statement"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/meson.lang b/data/language-specs/meson.lang
index d39902b..884cac3 100644
--- a/data/language-specs/meson.lang
+++ b/data/language-specs/meson.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="meson" _name="Meson" version="2.0" _section="Source">
+<language id="meson" name="Meson" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-meson</property>
     <property name="globs">meson.build;meson_options.txt</property>
@@ -29,10 +28,10 @@
   </metadata>
 
   <styles>
-    <style id="builtin-command" _name="Builtin Command" map-to="def:function"/>
-    <style id="operator" _name="Operator" map-to="def:operator"/>
-    <style id="string" _name="String" map-to="def:string" />
-    <style id="boolean" _name="Boolean" map-to="def:boolean"/>
+    <style id="builtin-command" name="Builtin Command" map-to="def:function"/>
+    <style id="operator" name="Operator" map-to="def:operator"/>
+    <style id="string" name="String" map-to="def:string" />
+    <style id="boolean" name="Boolean" map-to="def:boolean"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/modelica.lang b/data/language-specs/modelica.lang
index ebe5ed0..b1f26df 100644
--- a/data/language-specs/modelica.lang
+++ b/data/language-specs/modelica.lang
@@ -18,12 +18,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="modelica" _name="Modelica" version="2.0" _section="Scientific">
+<language id="modelica" name="Modelica" version="2.0" _section="Scientific">
   <metadata>
     <property name="mimetypes">text/x-modelica</property>
     <property name="globs">*.mo;*.mop</property>
@@ -33,18 +32,18 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"           map-to="def:comment"/>
-    <style id="string"            _name="String"            map-to="def:string"/>
-    <style id="operator"          _name="Operator"          map-to="def:operator"/>
-    <style id="class-type"        _name="Class type"        map-to="def:type"/>
-    <style id="data-type"         _name="Data type"         map-to="def:type"/>
-    <style id="default-attribute" _name="Default Attribute" map-to="def:identifier"/>
-    <style id="boolean"           _name="Boolean"           map-to="def:boolean"/>
-    <style id="decimal"           _name="Decimal"           map-to="def:decimal"/>
-    <style id="floating-point"    _name="Floating Point"    map-to="def:floating-point"/>
-    <style id="base-n-integer"    _name="Base-N Integer"    map-to="def:base-n-integer"/>
-    <style id="keyword"           _name="Keyword"           map-to="def:keyword"/>
-    <style id="builtin"           _name="Builtin"           map-to="def:builtin"/>
+    <style id="comment"           name="Comment"           map-to="def:comment"/>
+    <style id="string"            name="String"            map-to="def:string"/>
+    <style id="operator"          name="Operator"          map-to="def:operator"/>
+    <style id="class-type"        name="Class type"        map-to="def:type"/>
+    <style id="data-type"         name="Data type"         map-to="def:type"/>
+    <style id="default-attribute" name="Default Attribute" map-to="def:identifier"/>
+    <style id="boolean"           name="Boolean"           map-to="def:boolean"/>
+    <style id="decimal"           name="Decimal"           map-to="def:decimal"/>
+    <style id="floating-point"    name="Floating Point"    map-to="def:floating-point"/>
+    <style id="base-n-integer"    name="Base-N Integer"    map-to="def:base-n-integer"/>
+    <style id="keyword"           name="Keyword"           map-to="def:keyword"/>
+    <style id="builtin"           name="Builtin"           map-to="def:builtin"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/mxml.lang b/data/language-specs/mxml.lang
index b5b3155..a32ecb8 100644
--- a/data/language-specs/mxml.lang
+++ b/data/language-specs/mxml.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="mxml" _name="MXML" version="2.0" _section="Markup">
+<language id="mxml" name="MXML" version="2.0" _section="Markup">
   <metadata>
     <property name="globs">*.mxml</property>
     <property name="block-comment-start">&lt;!--</property>
@@ -29,8 +28,8 @@
   </metadata>
 
   <styles>
-    <style id="element-name" _name="Element name" map-to="xml:element-name"/>
-    <style id="cdata-delim" _name="CDATA delimiter" map-to="xml:cdata-delim"/>
+    <style id="element-name" name="Element name" map-to="xml:element-name"/>
+    <style id="cdata-delim" name="CDATA delimiter" map-to="xml:cdata-delim"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/nemerle.lang b/data/language-specs/nemerle.lang
index 0332c4d..dd0e7eb 100644
--- a/data/language-specs/nemerle.lang
+++ b/data/language-specs/nemerle.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="nemerle" _name="Nemerle" version="2.0" _section="Source">
+<language id="nemerle" name="Nemerle" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-nemerle</property>
     <property name="globs">*.n</property>
@@ -31,20 +30,20 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="character" _name="Character" map-to="def:character"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="floating-point" _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="binary" _name="Binary number" map-to="def:base-n-integer"/>
-    <style id="octal" _name="Octal number" map-to="def:base-n-integer"/>
-    <style id="hexadecimal" _name="Hexadecimal number" map-to="def:base-n-integer"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="character" name="Character" map-to="def:character"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="null-value" name="Null Value" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="floating-point" name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="binary" name="Binary number" map-to="def:base-n-integer"/>
+    <style id="octal" name="Octal number" map-to="def:base-n-integer"/>
+    <style id="hexadecimal" name="Hexadecimal number" map-to="def:base-n-integer"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/netrexx.lang b/data/language-specs/netrexx.lang
index d15a05a..2f71c4a 100644
--- a/data/language-specs/netrexx.lang
+++ b/data/language-specs/netrexx.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="netrexx" _name="NetRexx" version="2.0" _section="Source">
+<language id="netrexx" name="NetRexx" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-netrexx</property>
     <property name="globs">*.nrx</property>
@@ -32,20 +31,20 @@
   </metadata>
 
   <styles>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char" />
-    <style id="string" _name="String" map-to="def:string" />
-    <style id="char" _name="Character" map-to="def:character" />
-    <style id="line-comment" _name="Comment" map-to="def:comment" />
-    <style id="externals" _name="Externals" map-to="def:preprocessor" />
-    <style id="options" _name="Options" map-to="def:function" />
-    <style id="primitive-types" _name="Data Types" map-to="def:type" />
-    <style id="special" _name="Special" map-to="def:special-constant" />
-    <style id="visibility" _name="Visibility" map-to="def:identifier" />
-    <style id="modifiers" _name="Modifiers" map-to="def:type" />
-    <style id="keywords" _name="Keywords" map-to="def:keyword" />
-    <style id="sub-keywords" _name="Sub Keywords" map-to="def:shebang" />
-    <style id="builtin-function" _name="Builtin Function" map-to="def:builtin" />
-    <style id="numeric" _name="Number" map-to="def:number" />
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char" />
+    <style id="string" name="String" map-to="def:string" />
+    <style id="char" name="Character" map-to="def:character" />
+    <style id="line-comment" name="Comment" map-to="def:comment" />
+    <style id="externals" name="Externals" map-to="def:preprocessor" />
+    <style id="options" name="Options" map-to="def:function" />
+    <style id="primitive-types" name="Data Types" map-to="def:type" />
+    <style id="special" name="Special" map-to="def:special-constant" />
+    <style id="visibility" name="Visibility" map-to="def:identifier" />
+    <style id="modifiers" name="Modifiers" map-to="def:type" />
+    <style id="keywords" name="Keywords" map-to="def:keyword" />
+    <style id="sub-keywords" name="Sub Keywords" map-to="def:shebang" />
+    <style id="builtin-function" name="Builtin Function" map-to="def:builtin" />
+    <style id="numeric" name="Number" map-to="def:number" />
   </styles>
 
   <definitions>
diff --git a/data/language-specs/nsis.lang b/data/language-specs/nsis.lang
index d5d175c..ca866dd 100644
--- a/data/language-specs/nsis.lang
+++ b/data/language-specs/nsis.lang
@@ -16,22 +16,21 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="nsis" _name="NSIS" version="2.0" _section="Other">
+<language id="nsis" name="NSIS" version="2.0" _section="Other">
   <metadata>
     <property name="globs">*.nsi;*.nsh</property>
     <property name="line-comment-start">;</property>
   </metadata>
 
   <styles>
-    <style id="operator" _name="Operator" map-to="def:operator"/>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="variable" _name="Variable" map-to="makefile:variable"/>
+    <style id="operator" name="Operator" map-to="def:operator"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="variable" name="Variable" map-to="makefile:variable"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/objc.lang b/data/language-specs/objc.lang
index d820071..f323bb9 100644
--- a/data/language-specs/objc.lang
+++ b/data/language-specs/objc.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="objc" _name="Objective-C" version="2.0" _section="Source">
+<language id="objc" name="Objective-C" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-objcsrc</property>
     <property name="globs">*.m</property>
@@ -31,10 +30,10 @@
   </metadata>
 
   <styles>
-    <style id="keyword" _name="Keyword" map-to="c:keyword"/>
-    <style id="type" _name="Data Type" map-to="c:type"/>
-    <style id="common-defines" _name="Common Defines" map-to="c:common-defines"/>
-    <style id="string" _name="String" map-to="c:string"/>
+    <style id="keyword" name="Keyword" map-to="c:keyword"/>
+    <style id="type" name="Data Type" map-to="c:type"/>
+    <style id="common-defines" name="Common Defines" map-to="c:common-defines"/>
+    <style id="string" name="String" map-to="c:string"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/objj.lang b/data/language-specs/objj.lang
index 0b9d465..c3bd406 100644
--- a/data/language-specs/objj.lang
+++ b/data/language-specs/objj.lang
@@ -18,12 +18,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="objj" _name="Objective-J" version="2.0" _section="Source">
+<language id="objj" name="Objective-J" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-objective-j</property>
     <property name="globs">*.j</property>
@@ -33,13 +32,13 @@
   </metadata>
 
   <styles>
-    <style id="boolean"       _name="Boolean"       map-to="js:boolean"/>
-    <style id="keyword"       _name="Keyword"       map-to="js:keyword"/>
-    <style id="type"          _name="Data Type"     map-to="js:type"/>
-    <style id="preprocessor"  _name="Preprocessor"  map-to="def:preprocessor"/>
-    <style id="included-file" _name="Included File" map-to="js:string"/>
-    <style id="string"        _name="String"        map-to="js:string"/>
-    <style id="null-value"    _name="Null Value"    map-to="js:null-value"/>
+    <style id="boolean"       name="Boolean"       map-to="js:boolean"/>
+    <style id="keyword"       name="Keyword"       map-to="js:keyword"/>
+    <style id="type"          name="Data Type"     map-to="js:type"/>
+    <style id="preprocessor"  name="Preprocessor"  map-to="def:preprocessor"/>
+    <style id="included-file" name="Included File" map-to="js:string"/>
+    <style id="string"        name="String"        map-to="js:string"/>
+    <style id="null-value"    name="Null Value"    map-to="js:null-value"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/ocaml.lang b/data/language-specs/ocaml.lang
index d846a5a..013333a 100644
--- a/data/language-specs/ocaml.lang
+++ b/data/language-specs/ocaml.lang
@@ -19,12 +19,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="ocaml" _name="OCaml" version="2.0" _section="Source">
+<language id="ocaml" name="OCaml" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-ocaml</property>
     <property name="globs">*.ml;*.mli;*.mll;*.mly</property>
@@ -33,25 +32,25 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="ocamldoc" _name="Ocamldoc Comments" map-to="def:note"/>
-    <style id="base-n-integer" _name="Base-N Integer" map-to="def:base-n-integer"/>
-    <style id="floating-point" _name="Floating Point number" map-to="def:floating-point"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="meta-keyword" _name="Type, module or object keyword" map-to="def:keyword"/>
-    <style id="fun-keyword" _name="Builtin-function keyword" map-to="def:keyword"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="label" _name="Labeled argument" map-to="def:type"/>
-    <style id="poly-variant" _name="Polymorphic Variant" map-to="def:type"/>
-    <style id="variant" _name="Variant Constructor" map-to="def:type"/>
-    <style id="type-var" _name="Type Variable" map-to="def:type"/>
-    <style id="module" _name="Module Path" map-to="def:type"/>
-    <style id="escape" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="std-modules" _name="Standard Modules" map-to="def:type"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="ocamldoc" name="Ocamldoc Comments" map-to="def:note"/>
+    <style id="base-n-integer" name="Base-N Integer" map-to="def:base-n-integer"/>
+    <style id="floating-point" name="Floating Point number" map-to="def:floating-point"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="meta-keyword" name="Type, module or object keyword" map-to="def:keyword"/>
+    <style id="fun-keyword" name="Builtin-function keyword" map-to="def:keyword"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="label" name="Labeled argument" map-to="def:type"/>
+    <style id="poly-variant" name="Polymorphic Variant" map-to="def:type"/>
+    <style id="variant" name="Variant Constructor" map-to="def:type"/>
+    <style id="type-var" name="Type Variable" map-to="def:type"/>
+    <style id="module" name="Module Path" map-to="def:type"/>
+    <style id="escape" name="Escaped Character" map-to="def:special-char"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="std-modules" name="Standard Modules" map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/ocl.lang b/data/language-specs/ocl.lang
index 97453db..d6b8674 100644
--- a/data/language-specs/ocl.lang
+++ b/data/language-specs/ocl.lang
@@ -19,9 +19,8 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
@@ -30,7 +29,7 @@
  http://www.omg.org/technology/documents/formal/ocl.htm
 -->
 
-<language id="ocl" _name="OCL" version="2.0" _section="Other">
+<language id="ocl" name="OCL" version="2.0" _section="Other">
     <metadata>
         <property name="mimetypes">text/x-ocl</property>
         <property name="globs">*.ocl</property>
@@ -38,12 +37,12 @@
     </metadata>
 
     <styles>
-        <style id="comment" _name="Comment" map-to="def:comment"/>
-        <style id="string" _name="String" map-to="def:string"/>
-        <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-        <style id="operators" _name="Type Operators" map-to="def:keyword"/>
-        <style id="type" _name="Data Type" map-to="def:type"/>
-        <style id="operation" _name="Operation operator" map-to="def:keyword"/>
+        <style id="comment" name="Comment" map-to="def:comment"/>
+        <style id="string" name="String" map-to="def:string"/>
+        <style id="keyword" name="Keyword" map-to="def:keyword"/>
+        <style id="operators" name="Type Operators" map-to="def:keyword"/>
+        <style id="type" name="Data Type" map-to="def:type"/>
+        <style id="operation" name="Operation operator" map-to="def:keyword"/>
     </styles>
 
     <definitions>
diff --git a/data/language-specs/octave.lang b/data/language-specs/octave.lang
index 229c2ac..e1d06fa 100644
--- a/data/language-specs/octave.lang
+++ b/data/language-specs/octave.lang
@@ -18,12 +18,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="octave" _name="Octave" version="2.0" _section="Scientific">
+<language id="octave" name="Octave" version="2.0" _section="Scientific">
   <metadata>
     <property name="mimetypes">text/x-octave</property>
     <property name="globs">*.m</property>
@@ -38,16 +37,16 @@
   -->
 
   <styles>
-    <style id="comment"           _name="Comment"           map-to="def:comment"/>
-    <style id="string"            _name="String"            map-to="def:string"/>
-    <style id="operator"          _name="Operator"          map-to="def:operator"/>
-    <style id="data-type"         _name="Data type"         map-to="def:type"/>
-    <style id="storage-type"      _name="Storage Type"      map-to="def:type"/>
-    <style id="boolean"           _name="Boolean"           map-to="def:boolean"/>
-    <style id="package-manager"   _name="Package Manager"   map-to="def:preprocessor"/>
-    <style id="keyword"           _name="Keyword"           map-to="def:keyword"/>
-    <style id="reserved-constant" _name="Reserved Constant" map-to="def:special-constant"/>
-    <style id="builtin"           _name="Builtin"           map-to="def:builtin"/>
+    <style id="comment"           name="Comment"           map-to="def:comment"/>
+    <style id="string"            name="String"            map-to="def:string"/>
+    <style id="operator"          name="Operator"          map-to="def:operator"/>
+    <style id="data-type"         name="Data type"         map-to="def:type"/>
+    <style id="storage-type"      name="Storage Type"      map-to="def:type"/>
+    <style id="boolean"           name="Boolean"           map-to="def:boolean"/>
+    <style id="package-manager"   name="Package Manager"   map-to="def:preprocessor"/>
+    <style id="keyword"           name="Keyword"           map-to="def:keyword"/>
+    <style id="reserved-constant" name="Reserved Constant" map-to="def:special-constant"/>
+    <style id="builtin"           name="Builtin"           map-to="def:builtin"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/ooc.lang b/data/language-specs/ooc.lang
index 1d35711..6c6b07d 100644
--- a/data/language-specs/ooc.lang
+++ b/data/language-specs/ooc.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="ooc" _name="OOC" version="2.0" _section="Source">
+<language id="ooc" name="OOC" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.ooc</property>
     <property name="line-comment-start">//</property>
@@ -30,23 +29,23 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"                  map-to="def:comment"/>
-    <style id="error"             _name="Error"                    map-to="def:error"/>
-    <style id="escaped-character" _name="Escaped Character"        map-to="def:special-char"/>
-    <style id="string"            _name="String"                   map-to="def:string"/>
-    <style id="external"          _name="External"                 map-to="def:preprocessor"/>
-    <style id="declaration"       _name="Declaration"              map-to="def:type"/>
-    <style id="storage-class"     _name="Storage Class"            map-to="def:type"/>
-    <style id="scope-declaration" _name="Scope Declaration"        map-to="def:type"/>
-    <style id="keyword"           _name="Keyword"                  map-to="def:keyword"/>
-    <style id="null-value"        _name="Null Value"               map-to="def:special-constant"/>
-    <style id="boolean"           _name="Boolean value"            map-to="def:boolean"/>
-    <style id="floating-point"    _name="Floating point number"    map-to="def:floating-point"/>
-    <style id="decimal"           _name="Decimal number"           map-to="def:decimal"/>
-    <style id="octal"             _name="Octal number"             map-to="def:base-n-integer"/>
-    <style id="hexadecimal"       _name="Hexadecimal number"       map-to="def:base-n-integer"/>
-    <style id="reserved"          _name="Future Reserved Keywords" map-to="def:error"/>
-    <style id="type"              _name="Data Type"                map-to="def:type"/>
+    <style id="comment"           name="Comment"                  map-to="def:comment"/>
+    <style id="error"             name="Error"                    map-to="def:error"/>
+    <style id="escaped-character" name="Escaped Character"        map-to="def:special-char"/>
+    <style id="string"            name="String"                   map-to="def:string"/>
+    <style id="external"          name="External"                 map-to="def:preprocessor"/>
+    <style id="declaration"       name="Declaration"              map-to="def:type"/>
+    <style id="storage-class"     name="Storage Class"            map-to="def:type"/>
+    <style id="scope-declaration" name="Scope Declaration"        map-to="def:type"/>
+    <style id="keyword"           name="Keyword"                  map-to="def:keyword"/>
+    <style id="null-value"        name="Null Value"               map-to="def:special-constant"/>
+    <style id="boolean"           name="Boolean value"            map-to="def:boolean"/>
+    <style id="floating-point"    name="Floating point number"    map-to="def:floating-point"/>
+    <style id="decimal"           name="Decimal number"           map-to="def:decimal"/>
+    <style id="octal"             name="Octal number"             map-to="def:base-n-integer"/>
+    <style id="hexadecimal"       name="Hexadecimal number"       map-to="def:base-n-integer"/>
+    <style id="reserved"          name="Future Reserved Keywords" map-to="def:error"/>
+    <style id="type"              name="Data Type"                map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/opal.lang b/data/language-specs/opal.lang
index 8979eee..71cc578 100644
--- a/data/language-specs/opal.lang
+++ b/data/language-specs/opal.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="opal" _name="Opal" version="2.0" _section="Source">
+<language id="opal" name="Opal" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.sign;*.impl</property>
     <property name="line-comment-start">-- </property>
@@ -30,16 +29,16 @@
   </metadata>
 
   <styles>
-    <style id="module-handler" _name="Module Handler" map-to="def:preprocessor"/>
-    <style id="comment"        _name="Comment"        map-to="def:comment"/>
-    <style id="common-defines" _name="Common Defines" map-to="def:special-constant"/>
-    <style id="error"          _name="Error"          map-to="def:error"/>
-    <style id="string"         _name="String"         map-to="def:string"/>
-    <style id="keyword"        _name="Keyword"        map-to="def:keyword"/>
-    <style id="boolean"        _name="Boolean value"  map-to="def:boolean"/>
-    <style id="decimal"        _name="Decimal number" map-to="def:decimal"/>
-    <style id="type"           _name="Data Type"      map-to="def:type"/>
-    <style id="keysymbol"      _name="Keysymbol"      map-to="def:keyword"/>
+    <style id="module-handler" name="Module Handler" map-to="def:preprocessor"/>
+    <style id="comment"        name="Comment"        map-to="def:comment"/>
+    <style id="common-defines" name="Common Defines" map-to="def:special-constant"/>
+    <style id="error"          name="Error"          map-to="def:error"/>
+    <style id="string"         name="String"         map-to="def:string"/>
+    <style id="keyword"        name="Keyword"        map-to="def:keyword"/>
+    <style id="boolean"        name="Boolean value"  map-to="def:boolean"/>
+    <style id="decimal"        name="Decimal number" map-to="def:decimal"/>
+    <style id="type"           name="Data Type"      map-to="def:type"/>
+    <style id="keysymbol"      name="Keysymbol"      map-to="def:keyword"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/opencl.lang b/data/language-specs/opencl.lang
index 96b257b..0512c72 100644
--- a/data/language-specs/opencl.lang
+++ b/data/language-specs/opencl.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="opencl" _name="OpenCL" version="2.0" _section="Source">
+<language id="opencl" name="OpenCL" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.cl</property>
     <property name="line-comment-start">//</property>
@@ -30,13 +29,13 @@
   </metadata>
 
   <styles>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="data-type" _name="Data Type" map-to="def:type"/>
-    <style id="global-function" _name="Global Function" map-to="def:function"/>
-    <style id="device-function" _name="Device Function" map-to="def:function"/>
-    <style id="device-cast" _name="Device Cast" map-to="def:function"/>
-    <style id="opencl-const" _name="OpenCL Constant" map-to="def:special-constant"/>
-    <style id="global-var" _name="Global Variable" map-to="def:identifier"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="data-type" name="Data Type" map-to="def:type"/>
+    <style id="global-function" name="Global Function" map-to="def:function"/>
+    <style id="device-function" name="Device Function" map-to="def:function"/>
+    <style id="device-cast" name="Device Cast" map-to="def:function"/>
+    <style id="opencl-const" name="OpenCL Constant" map-to="def:special-constant"/>
+    <style id="global-var" name="Global Variable" map-to="def:identifier"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/pascal.lang b/data/language-specs/pascal.lang
index 150255b..f90d388 100644
--- a/data/language-specs/pascal.lang
+++ b/data/language-specs/pascal.lang
@@ -17,12 +17,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="pascal" _name="Pascal" version="2.0" _section="Source">
+<language id="pascal" name="Pascal" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-pascal</property>
     <property name="globs">*.p;*.pas</property>
@@ -30,12 +29,12 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="decimal" _name="Decimal" map-to="def:decimal"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="decimal" name="Decimal" map-to="def:decimal"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/perl.lang b/data/language-specs/perl.lang
index ae307a2..a1cf91f 100644
--- a/data/language-specs/perl.lang
+++ b/data/language-specs/perl.lang
@@ -15,15 +15,14 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 TODO: extended regex support
 FIXME: =pod should require an empty line before/after, as written in perlpod
 
 -->
-<language id="perl" _name="Perl" version="2.0" _section="Script">
+<language id="perl" name="Perl" version="2.0" _section="Script">
   <metadata>
     <property name="mimetypes">text/x-perl;application/x-perl</property>
     <property name="globs">*.pl;*.pm;*.al;*.perl;*.t</property>
@@ -31,25 +30,25 @@ FIXME: =pod should require an empty line before/after, as written in perlpod
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"            map-to="def:comment"/>
-    <style id="line-directive"    _name="Line Directive"     map-to="def:preprocessor"/>
-    <style id="include-statement" _name="Include Statement"  map-to="def:preprocessor"/>
-    <style id="string"            _name="String"             map-to="def:string"/>
-    <style id="keyword"           _name="Keyword"            map-to="def:keyword"/>
-    <style id="builtin"           _name="Builtin Function"   map-to="def:builtin"/>
-    <style id="here-doc"          _name="Heredoc"            map-to="def:string" />
-    <style id="here-doc-bound"    _name="Heredoc Bound"      map-to="def:string"/>
-    <style id="system-command"    _name="System Command"     map-to="def:string"/>
-    <style id="operator"          _name="Operator"           map-to="def:keyword"/>
-    <style id="variable"          _name="Variable"           map-to="def:type"/>
-    <style id="file-descriptor"   _name="File Descriptor"    map-to="def:special-constant"/>
-    <style id="control"           _name="Control"            map-to="def:preprocessor"/>
-    <style id="regex"             _name="Regular Expression" map-to="def:string"/>
-    <style id="error"             _name="Error"              map-to="def:error"/>
-    <style id="pod"               _name="POD"                map-to="def:comment"/>
-    <style id="pod-escape"        _name="POD Escape"         map-to="def:special-char"/>
-    <style id="pod-keyword"       _name="POD keyword"        map-to="def:keyword"/>
-    <style id="pod-heading"       _name="POD heading"        map-to="def:doc-comment-element"/>
+    <style id="comment"           name="Comment"            map-to="def:comment"/>
+    <style id="line-directive"    name="Line Directive"     map-to="def:preprocessor"/>
+    <style id="include-statement" name="Include Statement"  map-to="def:preprocessor"/>
+    <style id="string"            name="String"             map-to="def:string"/>
+    <style id="keyword"           name="Keyword"            map-to="def:keyword"/>
+    <style id="builtin"           name="Builtin Function"   map-to="def:builtin"/>
+    <style id="here-doc"          name="Heredoc"            map-to="def:string" />
+    <style id="here-doc-bound"    name="Heredoc Bound"      map-to="def:string"/>
+    <style id="system-command"    name="System Command"     map-to="def:string"/>
+    <style id="operator"          name="Operator"           map-to="def:keyword"/>
+    <style id="variable"          name="Variable"           map-to="def:type"/>
+    <style id="file-descriptor"   name="File Descriptor"    map-to="def:special-constant"/>
+    <style id="control"           name="Control"            map-to="def:preprocessor"/>
+    <style id="regex"             name="Regular Expression" map-to="def:string"/>
+    <style id="error"             name="Error"              map-to="def:error"/>
+    <style id="pod"               name="POD"                map-to="def:comment"/>
+    <style id="pod-escape"        name="POD Escape"         map-to="def:special-char"/>
+    <style id="pod-keyword"       name="POD keyword"        map-to="def:keyword"/>
+    <style id="pod-heading"       name="POD heading"        map-to="def:doc-comment-element"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/php.lang b/data/language-specs/php.lang
index d01587d..a0cbaf4 100644
--- a/data/language-specs/php.lang
+++ b/data/language-specs/php.lang
@@ -21,12 +21,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="php" _name="PHP" version="2.0" _section="Script">
+<language id="php" name="PHP" version="2.0" _section="Script">
   <metadata>
     <property 
name="mimetypes">text/x-php;application/x-php;text/x-php-source;application/x-php-source</property>
     <property name="globs">*.php;*.php3;*.php4;*.phtml</property>
@@ -36,25 +35,25 @@
   </metadata>
 
   <styles>
-    <style id="preprocessor" _name="Preprocessor tags" map-to="def:preprocessor"/>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="variable" _name="Variable" map-to="def:identifier"/>
-    <style id="identifier" _name="Identifier"/> <!-- map to nothing -->
-    <style id="escape" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="here-doc" _name="Heredoc" map-to="def:string"/>
-    <style id="here-doc-bound" _name="Heredoc Bound" map-to="def:keyword"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="common-function" _name="Common Function" map-to="def:keyword"/>
-    <style id="operator" _name="Operator" map-to="def:operator"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="floating-point" _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
-    <style id="octal" _name="Octal number" map-to="def:base-n-integer"/>
-    <style id="hexadecimal" _name="Hexadecimal number" map-to="def:base-n-integer"/>
+    <style id="preprocessor" name="Preprocessor tags" map-to="def:preprocessor"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="variable" name="Variable" map-to="def:identifier"/>
+    <style id="identifier" name="Identifier"/> <!-- map to nothing -->
+    <style id="escape" name="Escaped Character" map-to="def:special-char"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="here-doc" name="Heredoc" map-to="def:string"/>
+    <style id="here-doc-bound" name="Heredoc Bound" map-to="def:keyword"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="common-function" name="Common Function" map-to="def:keyword"/>
+    <style id="operator" name="Operator" map-to="def:operator"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="null-value" name="Null Value" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="floating-point" name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal" name="Decimal number" map-to="def:decimal"/>
+    <style id="octal" name="Octal number" map-to="def:base-n-integer"/>
+    <style id="hexadecimal" name="Hexadecimal number" map-to="def:base-n-integer"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/pig.lang b/data/language-specs/pig.lang
index e76eb5d..96c22fb 100644
--- a/data/language-specs/pig.lang
+++ b/data/language-specs/pig.lang
@@ -18,13 +18,12 @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   Lesser General Public License for more details.
 
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  You should have received a copy of the GNU Lesser General Public License
+  along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
-<language id="pig" _name="Pig" version="2.0" _section="Source">
+<language id="pig" name="Pig" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.pig</property>
     <property name="line-comment-start">--</property>
@@ -33,12 +32,12 @@
   </metadata>
 
   <styles>
-    <style id="datatype" _name="Data Type" map-to="def:type" />
-    <style id="reserved-words" _name="Reserved Words" map-to="def:keyword" />
-    <style id="builtin-functions" _name="Built In Functions" map-to="def:function" />
-    <style id="boolean" _name="Boolean values" map-to="def:boolean" />
-    <style id="null" _name="Null" map-to="def:special-constant" />
-    <style id="comment" _name="Comment" map-to="def:comment" />
+    <style id="datatype" name="Data Type" map-to="def:type" />
+    <style id="reserved-words" name="Reserved Words" map-to="def:keyword" />
+    <style id="builtin-functions" name="Built In Functions" map-to="def:function" />
+    <style id="boolean" name="Boolean values" map-to="def:boolean" />
+    <style id="null" name="Null" map-to="def:special-constant" />
+    <style id="comment" name="Comment" map-to="def:comment" />
   </styles>
 
   <default-regex-options case-sensitive="true" />
diff --git a/data/language-specs/pkgconfig.lang b/data/language-specs/pkgconfig.lang
index 56e2d5e..5b67b8b 100644
--- a/data/language-specs/pkgconfig.lang
+++ b/data/language-specs/pkgconfig.lang
@@ -16,20 +16,19 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="pkgconfig" _name="pkg-config" version="2.0" _section="Other">
+<language id="pkgconfig" name="pkg-config" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/x-pkg-config</property>
     <property name="globs">*.pc</property>
   </metadata>
 
   <styles>
-    <style id="variable" _name="Variable" map-to="def:keyword"/>
-    <style id="info" _name="Package Info" map-to="def:keyword"/>
+    <style id="variable" name="Variable" map-to="def:keyword"/>
+    <style id="info" name="Package Info" map-to="def:keyword"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/po.lang b/data/language-specs/po.lang
index 1b35770..a36eb9f 100644
--- a/data/language-specs/po.lang
+++ b/data/language-specs/po.lang
@@ -16,9 +16,8 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 <language id="gettext-translation" _name="gettext translation" version="2.0" _section="Other">
@@ -29,12 +28,12 @@
   </metadata>
 
   <styles>
-    <style id="comment"   _name="Comment"       map-to="def:comment"/>
-    <style id="location"  _name="Location"      map-to="def:comment"/>
-    <style id="string"    _name="String"        map-to="def:string"/>
-    <style id="fuzzy"     _name="Fuzzy"         map-to="def:note"/>
-    <style id="keyword"   _name="Keyword"       map-to="def:keyword"/>
-    <style id="format"    _name="String Format" map-to="def:special-char"/>
+    <style id="comment"   name="Comment"       map-to="def:comment"/>
+    <style id="location"  name="Location"      map-to="def:comment"/>
+    <style id="string"    name="String"        map-to="def:string"/>
+    <style id="fuzzy"     name="Fuzzy"         map-to="def:note"/>
+    <style id="keyword"   name="Keyword"       map-to="def:keyword"/>
+    <style id="format"    name="String Format" map-to="def:special-char"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/prolog.lang b/data/language-specs/prolog.lang
index 50490a4..240a197 100644
--- a/data/language-specs/prolog.lang
+++ b/data/language-specs/prolog.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="prolog" _name="Prolog" version="2.0" _section="Source">
+<language id="prolog" name="Prolog" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-prolog</property>
     <property name="globs">*.prolog</property>
@@ -31,14 +30,14 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"           map-to="def:comment"/>
-    <style id="variable"          _name="Variable"          map-to="def:type"/>
-    <style id="keyword"           _name="Keyword"           map-to="def:keyword"/>
-    <style id="string"            _name="String"            map-to="def:string"/>
-    <style id="number"            _name="Number"            map-to="def:decimal"/>
-    <style id="operator"          _name="Operator"          map-to="def:operator"/>
-    <style id="error"             _name="Error"             map-to="def:error"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
+    <style id="comment"           name="Comment"           map-to="def:comment"/>
+    <style id="variable"          name="Variable"          map-to="def:type"/>
+    <style id="keyword"           name="Keyword"           map-to="def:keyword"/>
+    <style id="string"            name="String"            map-to="def:string"/>
+    <style id="number"            name="Number"            map-to="def:decimal"/>
+    <style id="operator"          name="Operator"          map-to="def:operator"/>
+    <style id="error"             name="Error"             map-to="def:error"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/protobuf.lang b/data/language-specs/protobuf.lang
index 0fa9cdd..29c633b 100644
--- a/data/language-specs/protobuf.lang
+++ b/data/language-specs/protobuf.lang
@@ -28,13 +28,13 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="statement" _name="Statement" map-to="def:preprocessor"/>
-    <style id="variable" _name="Variable" map-to="def:type"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="string" _name="String" map-to="def:string"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="statement" name="Statement" map-to="def:preprocessor"/>
+    <style id="variable" name="Variable" map-to="def:type"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="string" name="String" map-to="def:string"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/puppet.lang b/data/language-specs/puppet.lang
index 35423f0..9042bb2 100644
--- a/data/language-specs/puppet.lang
+++ b/data/language-specs/puppet.lang
@@ -16,25 +16,24 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="puppet" _name="Puppet" version="2.0" _section="Other">
+<language id="puppet" name="Puppet" version="2.0" _section="Other">
   <metadata>
     <property name="globs">*.pp</property>
     <property name="line-comment-start">#</property>
   </metadata>
 
   <styles>
-    <style id="resources"               _name="Resources"           map-to="def:keyword"/>
-    <style id="parameters"              _name="Parameters"          map-to="def:statement"/>
-    <style id="metaparameters"          _name="Metaparameters"      map-to="def:statement"/>
-    <style id="functions"               _name="Functions"           map-to="def:type"/>
-    <style id="values"                  _name="Values"              map-to="def:type"/>
-    <style id="variables"               _name="Variables"           map-to="def:identifier"/>
-    <style id="class-names"             _name="Class names"         map-to="def:preprocessor"/>
+    <style id="resources"               name="Resources"           map-to="def:keyword"/>
+    <style id="parameters"              name="Parameters"          map-to="def:statement"/>
+    <style id="metaparameters"          name="Metaparameters"      map-to="def:statement"/>
+    <style id="functions"               name="Functions"           map-to="def:type"/>
+    <style id="values"                  name="Values"              map-to="def:type"/>
+    <style id="variables"               name="Variables"           map-to="def:identifier"/>
+    <style id="class-names"             name="Class names"         map-to="def:preprocessor"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/python.lang b/data/language-specs/python.lang
index e80cdce..ea20715 100644
--- a/data/language-specs/python.lang
+++ b/data/language-specs/python.lang
@@ -20,12 +20,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="python" _name="Python" version="2.0" _section="Script">
+<language id="python" name="Python" version="2.0" _section="Script">
   <metadata>
     <property name="mimetypes">text/x-python;application/x-python</property>
     <property name="globs">*.py</property>
@@ -33,25 +32,25 @@
   </metadata>
 
   <styles>
-    <style id="module-handler"    _name="Module Handler"        map-to="def:preprocessor"/>
-    <style id="keyword"           _name="Keyword"               map-to="def:keyword"/>
-    <style id="multiline-string"  _name="Multiline string"      map-to="def:string"/>
-    <style id="string"            _name="String"                map-to="def:string"/>
-    <style id="escaped-char"      _name="Escaped Character"     map-to="def:special-char"/>
-    <style id="format"            _name="Format"                map-to="def:character"/>
-    <style id="string-conversion" _name="String Conversion"/>
-    <style id="special-variable"  _name="Special Variable"      map-to="def:identifier"/>
-    <style id="boolean"           _name="Boolean"               map-to="def:boolean"/>
-    <style id="floating-point"    _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal"           _name="Decimal number"        map-to="def:decimal"/>
-    <style id="base-n-integer"    _name="Base-N number"         map-to="def:base-n-integer"/>
-    <style id="complex"           _name="Complex number"        map-to="def:complex"/>
-    <style id="builtin-constant"  _name="Builtin Constant"      map-to="def:special-constant"/>
-    <style id="builtin-object"    _name="Builtin Object"        map-to="def:type"/>
-    <style id="builtin-function"  _name="Builtin Function"      map-to="def:builtin"/>
-    <style id="function-name"     _name="Function Name"         map-to="def:function"/>
-    <style id="class-name"        _name="Class Name"            map-to="def:function"/>
-    <style id="decorator"         _name="Decorator"             map-to="def:preprocessor"/>
+    <style id="module-handler"    name="Module Handler"        map-to="def:preprocessor"/>
+    <style id="keyword"           name="Keyword"               map-to="def:keyword"/>
+    <style id="multiline-string"  name="Multiline string"      map-to="def:string"/>
+    <style id="string"            name="String"                map-to="def:string"/>
+    <style id="escaped-char"      name="Escaped Character"     map-to="def:special-char"/>
+    <style id="format"            name="Format"                map-to="def:character"/>
+    <style id="string-conversion" name="String Conversion"/>
+    <style id="special-variable"  name="Special Variable"      map-to="def:identifier"/>
+    <style id="boolean"           name="Boolean"               map-to="def:boolean"/>
+    <style id="floating-point"    name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal"           name="Decimal number"        map-to="def:decimal"/>
+    <style id="base-n-integer"    name="Base-N number"         map-to="def:base-n-integer"/>
+    <style id="complex"           name="Complex number"        map-to="def:complex"/>
+    <style id="builtin-constant"  name="Builtin Constant"      map-to="def:special-constant"/>
+    <style id="builtin-object"    name="Builtin Object"        map-to="def:type"/>
+    <style id="builtin-function"  name="Builtin Function"      map-to="def:builtin"/>
+    <style id="function-name"     name="Function Name"         map-to="def:function"/>
+    <style id="class-name"        name="Class Name"            map-to="def:function"/>
+    <style id="decorator"         name="Decorator"             map-to="def:preprocessor"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/python3.lang b/data/language-specs/python3.lang
index 5bd0030..1ab853b 100644
--- a/data/language-specs/python3.lang
+++ b/data/language-specs/python3.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="python3" _name="Python 3" version="2.0" _section="Script">
+<language id="python3" name="Python 3" version="2.0" _section="Script">
   <metadata>
     <property name="mimetypes">text/x-python3</property>
     <property name="globs">*.py3</property>
@@ -29,21 +28,21 @@
   </metadata>
 
   <styles>
-    <style id="module-handler"    _name="Module Handler"        map-to="python:module-handler"/>
-    <style id="keyword"           _name="Keyword"               map-to="python:keyword"/>
-    <style id="multiline-string"  _name="Multiline string"      map-to="python:multiline-string"/>
-    <style id="string"            _name="String"                map-to="python:string"/>
-    <style id="escaped-char"      _name="Escaped Character"     map-to="python:escaped-char"/>
-    <style id="format"            _name="Format"                map-to="python:format"/>
-    <style id="special-variable"  _name="Special Variable"      map-to="python:special-variable"/>
-    <style id="boolean"           _name="Boolean"               map-to="python:boolean"/>
-    <style id="floating-point"    _name="Floating point number" map-to="python:floating-point"/>
-    <style id="decimal"           _name="Decimal number"        map-to="python:decimal"/>
-    <style id="base-n-integer"    _name="Base-N number"         map-to="python:base-n-integer"/>
-    <style id="complex"           _name="Complex number"        map-to="python:complex"/>
-    <style id="builtin-constant"  _name="Builtin Constant"      map-to="python:builtin-constant"/>
-    <style id="builtin-object"    _name="Builtin Object"        map-to="python:builtin-object"/>
-    <style id="builtin-function"  _name="Builtin Function"      map-to="python:builtin-function"/>
+    <style id="module-handler"    name="Module Handler"        map-to="python:module-handler"/>
+    <style id="keyword"           name="Keyword"               map-to="python:keyword"/>
+    <style id="multiline-string"  name="Multiline string"      map-to="python:multiline-string"/>
+    <style id="string"            name="String"                map-to="python:string"/>
+    <style id="escaped-char"      name="Escaped Character"     map-to="python:escaped-char"/>
+    <style id="format"            name="Format"                map-to="python:format"/>
+    <style id="special-variable"  name="Special Variable"      map-to="python:special-variable"/>
+    <style id="boolean"           name="Boolean"               map-to="python:boolean"/>
+    <style id="floating-point"    name="Floating point number" map-to="python:floating-point"/>
+    <style id="decimal"           name="Decimal number"        map-to="python:decimal"/>
+    <style id="base-n-integer"    name="Base-N number"         map-to="python:base-n-integer"/>
+    <style id="complex"           name="Complex number"        map-to="python:complex"/>
+    <style id="builtin-constant"  name="Builtin Constant"      map-to="python:builtin-constant"/>
+    <style id="builtin-object"    name="Builtin Object"        map-to="python:builtin-object"/>
+    <style id="builtin-function"  name="Builtin Function"      map-to="python:builtin-function"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/rpmspec.lang b/data/language-specs/rpmspec.lang
index e65d9bd..798d755 100644
--- a/data/language-specs/rpmspec.lang
+++ b/data/language-specs/rpmspec.lang
@@ -16,11 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
+<!-- Translators: do not translate "spec", it's the file extension. -->
 <language id="rpmspec" _name="RPM spec" version="2.0" _section="Other">
   <metadata>
     <property name="mimetypes">text/x-rpm-spec</property>
@@ -29,19 +29,19 @@
   </metadata>
 
   <styles>
-    <style id="define" _name="Define" map-to="def:preprocessor"/>
-    <style id="header" _name="Header" map-to="def:keyword"/>
-    <style id="section" _name="Section" map-to="def:type"/>
-    <style id="spec-macro" _name="Spec Macro" map-to="def:preprocessor"/>
-    <style id="directory-macro" _name="Directory Macro" map-to="def:identifier"/>
-    <style id="command-macro" _name="Command Macro" map-to="def:identifier"/>
-    <style id="conditional-macro" _name="Conditional Macro" map-to="def:preprocessor"/>
-    <style id="other-macro" _name="Other Macro" map-to="def:identifier"/>
-    <style id="flow-conditional" _name="Flow Conditional" map-to="def:preprocessor"/>
-    <style id="rpm-var" _name="RPM Variable" map-to="def:identifier"/>
-    <style id="switch" _name="Switch" map-to="def:operator"/>
-    <style id="changelog-date" _name="Date" map-to="changelog:date"/>
-    <style id="changelog-email" _name="Email" map-to="changelog:email"/>
+    <style id="define" name="Define" map-to="def:preprocessor"/>
+    <style id="header" name="Header" map-to="def:keyword"/>
+    <style id="section" name="Section" map-to="def:type"/>
+    <style id="spec-macro" name="Spec Macro" map-to="def:preprocessor"/>
+    <style id="directory-macro" name="Directory Macro" map-to="def:identifier"/>
+    <style id="command-macro" name="Command Macro" map-to="def:identifier"/>
+    <style id="conditional-macro" name="Conditional Macro" map-to="def:preprocessor"/>
+    <style id="other-macro" name="Other Macro" map-to="def:identifier"/>
+    <style id="flow-conditional" name="Flow Conditional" map-to="def:preprocessor"/>
+    <style id="rpm-var" name="RPM Variable" map-to="def:identifier"/>
+    <style id="switch" name="Switch" map-to="def:operator"/>
+    <style id="changelog-date" name="Date" map-to="changelog:date"/>
+    <style id="changelog-email" name="Email" map-to="changelog:email"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/rst.lang b/data/language-specs/rst.lang
index ebeacdb..9fecbb8 100644
--- a/data/language-specs/rst.lang
+++ b/data/language-specs/rst.lang
@@ -15,12 +15,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="rst" _name="reStructuredText" version="2.0" _section="Markup">
+<language id="rst" name="reStructuredText" version="2.0" _section="Markup">
   <metadata>
     <property name="mimetypes">text/x-rst</property>
     <property name="globs">*.rst</property>
@@ -28,15 +27,15 @@
   </metadata>
 
   <styles>
-    <style id="header" _name="Header" map-to="def:type"/>
-    <style id="emphasis" _name="Emphasis" map-to="def:doc-comment-element"/>
-    <style id="strong-emphasis" _name="Strong Emphasis" map-to="def:statement"/>
-    <style id="bullet" _name="Bullet" map-to="def:preprocessor"/>
-    <style id="directive" _name="Directive" map-to="def:constant"/>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="link" _name="Link" map-to="def:type"/>
-    <style id="substitution" _name="Substitution" map-to="def:type"/>
-    <style id="code" _name="Code" map-to="def:identifier"/>
+    <style id="header" name="Header" map-to="def:type"/>
+    <style id="emphasis" name="Emphasis" map-to="def:doc-comment-element"/>
+    <style id="strong-emphasis" name="Strong Emphasis" map-to="def:statement"/>
+    <style id="bullet" name="Bullet" map-to="def:preprocessor"/>
+    <style id="directive" name="Directive" map-to="def:constant"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="link" name="Link" map-to="def:type"/>
+    <style id="substitution" name="Substitution" map-to="def:type"/>
+    <style id="code" name="Code" map-to="def:identifier"/>
     <style id="url" name="Url" map-to="def:underlined"/>
   </styles>
 
diff --git a/data/language-specs/ruby.lang b/data/language-specs/ruby.lang
index 2166898..ed08572 100644
--- a/data/language-specs/ruby.lang
+++ b/data/language-specs/ruby.lang
@@ -19,12 +19,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="ruby" _name="Ruby" version="2.0" _section="Script">
+<language id="ruby" name="Ruby" version="2.0" _section="Script">
   <metadata>
     <property name="mimetypes">application/x-ruby;text/x-ruby</property>
     <property name="globs">*.rb;*.rake;*.gemspec;Rakefile;Capfile;Gemfile</property>
@@ -32,29 +31,28 @@
   </metadata>
 
   <styles>
-    <style id="escape"               _name="Escaped Character"     map-to="def:special-char"/>
-    <style id="comment"              _name="Comment"               map-to="def:comment"/>
-    <style id="attribute-definition" _name="Attribute Definition"  map-to="def:statement"/>
-    <style id="module-handler"       _name="Module handler"        map-to="def:preprocessor"/>
-    <style id="keyword"              _name="Keyword"               map-to="def:keyword"/>
-    <style id="nil-value"            _name="Nil Constant"          map-to="def:special-constant"/>
-    <style id="boolean"              _name="Boolean value"         map-to="def:boolean"/>
-    <style id="floating-point"       _name="Floating point number" map-to="def:floating-point"/>
-    <style id="decimal"              _name="Decimal number"        map-to="def:decimal"/>
-    <style id="base-n-integer"       _name="Base-N number"         map-to="def:base-n-integer"/>
-    <style id="numeric-literal"      _name="Numeric literal"       map-to="def:base-n-integer"/>
-    <style id="string"               _name="String"                map-to="def:string"/>
-    <style id="literal"              _name="Literal"               map-to="def:special-char"/>
-    <!-- Translators: functions that are provided in the language -->
-    <style id="builtin"              _name="Builtin"               map-to="def:type"/>
-    <style id="constant"             _name="Constant"              map-to="def:type"/>
-    <style id="symbol"               _name="Symbol"                map-to="def:string"/>
-    <style id="special-variable"     _name="Special Variable"      map-to="def:identifier"/>
-    <style id="predefined-variable"  _name="Predefined Variable"   map-to="def:identifier"/>
-    <style id="variable"             _name="Variable"              map-to="def:identifier"/>
-    <style id="here-doc"             _name="Heredoc"               map-to="def:string" />
-    <style id="here-doc-bound"       _name="Heredoc Bound"         map-to="def:string"/>
-    <style id="regex"                _name="Regular Expression"    map-to="def:identifier"/>
+    <style id="escape"               name="Escaped Character"     map-to="def:special-char"/>
+    <style id="comment"              name="Comment"               map-to="def:comment"/>
+    <style id="attribute-definition" name="Attribute Definition"  map-to="def:statement"/>
+    <style id="module-handler"       name="Module handler"        map-to="def:preprocessor"/>
+    <style id="keyword"              name="Keyword"               map-to="def:keyword"/>
+    <style id="nil-value"            name="Nil Constant"          map-to="def:special-constant"/>
+    <style id="boolean"              name="Boolean value"         map-to="def:boolean"/>
+    <style id="floating-point"       name="Floating point number" map-to="def:floating-point"/>
+    <style id="decimal"              name="Decimal number"        map-to="def:decimal"/>
+    <style id="base-n-integer"       name="Base-N number"         map-to="def:base-n-integer"/>
+    <style id="numeric-literal"      name="Numeric literal"       map-to="def:base-n-integer"/>
+    <style id="string"               name="String"                map-to="def:string"/>
+    <style id="literal"              name="Literal"               map-to="def:special-char"/>
+    <style id="builtin"              name="Builtin"               map-to="def:type"/>
+    <style id="constant"             name="Constant"              map-to="def:type"/>
+    <style id="symbol"               name="Symbol"                map-to="def:string"/>
+    <style id="special-variable"     name="Special Variable"      map-to="def:identifier"/>
+    <style id="predefined-variable"  name="Predefined Variable"   map-to="def:identifier"/>
+    <style id="variable"             name="Variable"              map-to="def:identifier"/>
+    <style id="here-doc"             name="Heredoc"               map-to="def:string" />
+    <style id="here-doc-bound"       name="Heredoc Bound"         map-to="def:string"/>
+    <style id="regex"                name="Regular Expression"    map-to="def:identifier"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/rust.lang b/data/language-specs/rust.lang
index c3ca232..570c1aa 100644
--- a/data/language-specs/rust.lang
+++ b/data/language-specs/rust.lang
@@ -13,9 +13,8 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
@@ -33,7 +32,7 @@ option. This file may not be copied, modified, or distributed
 except according to those terms.
 -->
 
-<language id="rust" _name="Rust" version="2.0" _section="Source">
+<language id="rust" name="Rust" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/rust</property>
     <property name="globs">*.rs</property>
@@ -43,18 +42,18 @@ except according to those terms.
   </metadata>
 
   <styles>
-    <style id="comment"    _name="Comment"       map-to="def:comment"/>
-    <style id="string"     _name="String"        map-to="def:string"/>
-    <style id="char"       _name="Character"     map-to="def:character"/>
-    <style id="keyword"    _name="Keyword"       map-to="def:keyword"/>
-    <style id="type"       _name="Data Type"     map-to="def:type"/>
-    <style id="boolean"    _name="Boolean value" map-to="def:boolean"/>
-    <style id="identifier" _name="Identifier"    map-to="def:identifier"/>
-    <style id="number"     _name="Number"        map-to="def:number"/>
-    <style id="scope"      _name="Scope"         map-to="def:preprocessor"/>
-    <style id="attribute"  _name="Attribute"     map-to="def:preprocessor"/>
-    <style id="macro"      _name="Macro"         map-to="def:preprocessor"/>
-    <style id="error"      _name="Error"         map-to="def:error"/>
+    <style id="comment"    name="Comment"       map-to="def:comment"/>
+    <style id="string"     name="String"        map-to="def:string"/>
+    <style id="char"       name="Character"     map-to="def:character"/>
+    <style id="keyword"    name="Keyword"       map-to="def:keyword"/>
+    <style id="type"       name="Data Type"     map-to="def:type"/>
+    <style id="boolean"    name="Boolean value" map-to="def:boolean"/>
+    <style id="identifier" name="Identifier"    map-to="def:identifier"/>
+    <style id="number"     name="Number"        map-to="def:number"/>
+    <style id="scope"      name="Scope"         map-to="def:preprocessor"/>
+    <style id="attribute"  name="Attribute"     map-to="def:preprocessor"/>
+    <style id="macro"      name="Macro"         map-to="def:preprocessor"/>
+    <style id="error"      name="Error"         map-to="def:error"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/scala.lang b/data/language-specs/scala.lang
index 953afb9..ce5205d 100644
--- a/data/language-specs/scala.lang
+++ b/data/language-specs/scala.lang
@@ -17,12 +17,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="scala" _name="Scala" version="2.0" _section="Source">
+<language id="scala" name="Scala" version="2.0" _section="Source">
 
   <metadata>
     <property name="mimetypes">text/x-scala</property>
@@ -33,21 +32,21 @@
   </metadata>
 
   <styles>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="external" _name="External" map-to="def:preprocessor"/>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="declaration" _name="Declaration" map-to="def:type"/>
-    <style id="modifier" _name="Modifier" map-to="def:type"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="special" _name="Special Constant" map-to="def:special-constant"/>
-    <style id="number" _name="Number" map-to="def:decimal"/>
-    <style id="operator" _name="Operator" map-to="def:operator"/>
-    <style id="type" _name="Data Type" map-to="def:identifier"/>
-    <style id="builtin" _name="Built In" map-to="def:type"/>
-    <style id="other" _name="Other" map-to="def:special-char"/>
-    <style id="xmltag" _name="XML Tag" map-to="def:identifier"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="external" name="External" map-to="def:preprocessor"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
+    <style id="declaration" name="Declaration" map-to="def:type"/>
+    <style id="modifier" name="Modifier" map-to="def:type"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="special" name="Special Constant" map-to="def:special-constant"/>
+    <style id="number" name="Number" map-to="def:decimal"/>
+    <style id="operator" name="Operator" map-to="def:operator"/>
+    <style id="type" name="Data Type" map-to="def:identifier"/>
+    <style id="builtin" name="Built In" map-to="def:type"/>
+    <style id="other" name="Other" map-to="def:special-char"/>
+    <style id="xmltag" name="XML Tag" map-to="def:identifier"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/scheme.lang b/data/language-specs/scheme.lang
index 24f1fc3..188c807 100644
--- a/data/language-specs/scheme.lang
+++ b/data/language-specs/scheme.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="scheme" _name="Scheme" version="2.0" _section="Source">
+<language id="scheme" name="Scheme" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-scheme</property>
     <property name="globs">*.scm</property>
@@ -29,11 +28,11 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="boolean" _name="Boolean" map-to="def:boolean"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="function" _name="Function" map-to="def:function"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="boolean" name="Boolean" map-to="def:boolean"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="function" name="Function" map-to="def:function"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/scilab.lang b/data/language-specs/scilab.lang
index bbcf0ca..48df3cd 100644
--- a/data/language-specs/scilab.lang
+++ b/data/language-specs/scilab.lang
@@ -16,25 +16,24 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="scilab" _name="Scilab" version="2.0" _section="Scientific">
+<language id="scilab" name="Scilab" version="2.0" _section="Scientific">
   <metadata>
     <property name="globs">*.sce;*.sci</property>
     <property name="line-comment-start">//</property>
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"           map-to="def:comment"/>
-    <style id="floating-point"    _name="Floating Point"    map-to="def:floating-point"/>
-    <style id="string"            _name="String"            map-to="def:string"/>
-    <style id="keyword"           _name="Keyword"           map-to="def:keyword"/>
-    <style id="function"          _name="Function"          map-to="def:function"/>
-    <style id="boolean"           _name="Boolean"           map-to="def:boolean"/>
-    <style id="reserved-constant" _name="Reserved Constant" map-to="def:special-constant"/>
+    <style id="comment"           name="Comment"           map-to="def:comment"/>
+    <style id="floating-point"    name="Floating Point"    map-to="def:floating-point"/>
+    <style id="string"            name="String"            map-to="def:string"/>
+    <style id="keyword"           name="Keyword"           map-to="def:keyword"/>
+    <style id="function"          name="Function"          map-to="def:function"/>
+    <style id="boolean"           name="Boolean"           map-to="def:boolean"/>
+    <style id="reserved-constant" name="Reserved Constant" map-to="def:special-constant"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/sh.lang b/data/language-specs/sh.lang
index bd242c3..b6a8053 100644
--- a/data/language-specs/sh.lang
+++ b/data/language-specs/sh.lang
@@ -17,12 +17,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="sh" _name="sh" version="2.0" _section="Script">
+<language id="sh" name="sh" version="2.0" _section="Script">
   <metadata>
     <property name="mimetypes">text/x-shellscript;application/x-shellscript;text/x-sh</property>
     <property name="globs">*.sh;*bashrc;.profile;.bash_profile</property>
@@ -30,16 +29,16 @@
   </metadata>
 
   <styles>
-    <style id="comment"             _name="Comment"             map-to="def:comment"/>
-    <style id="function"            _name="Function"            map-to="def:function"/>
-    <style id="string"              _name="String"              map-to="def:string"/>
-    <style id="keyword"             _name="Keyword"             map-to="def:keyword"/>
-    <style id="variable"            _name="Variable"            map-to="def:type"/> <!-- FIXME: need to sort 
out proper styles for variables -->
-    <style id="variable-definition" _name="Variable Definition" map-to="sh:variable"/>
-    <style id="others"              _name="Others"              map-to="def:keyword"/>
-    <style id="common-command"      _name="Common Commands"     map-to="def:keyword"/>
-    <style id="here-doc-bound"      _name="Heredoc Bound"       map-to="def:keyword"/>
-    <style id="subshell"            _name="Subshell"            map-to="def:preprocessor"/>
+    <style id="comment"             name="Comment"             map-to="def:comment"/>
+    <style id="function"            name="Function"            map-to="def:function"/>
+    <style id="string"              name="String"              map-to="def:string"/>
+    <style id="keyword"             name="Keyword"             map-to="def:keyword"/>
+    <style id="variable"            name="Variable"            map-to="def:type"/> <!-- FIXME: need to sort 
out proper styles for variables -->
+    <style id="variable-definition" name="Variable Definition" map-to="sh:variable"/>
+    <style id="others"              name="Others"              map-to="def:keyword"/>
+    <style id="common-command"      name="Common Commands"     map-to="def:keyword"/>
+    <style id="here-doc-bound"      name="Heredoc Bound"       map-to="def:keyword"/>
+    <style id="subshell"            name="Subshell"            map-to="def:preprocessor"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/sml.lang b/data/language-specs/sml.lang
index 22b89a6..0557ce3 100644
--- a/data/language-specs/sml.lang
+++ b/data/language-specs/sml.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="sml" _name="Standard ML" version="2.0" _section="Source">
+<language id="sml" name="Standard ML" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.sml;*.sig</property>
     <property name="block-comment-start">(*</property>
@@ -29,17 +28,17 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="character" _name="Character" map-to="def:character"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="base-n-integer" _name="Base-N Integer" map-to="def:base-n-integer"/>
-    <style id="decimal" _name="Decimal" map-to="def:decimal"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="floating-point" _name="Floating Point number" map-to="def:floating-point"/>
-    <style id="special-var" _name="Module name, Variant, etc" map-to="def:type"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="character" name="Character" map-to="def:character"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
+    <style id="base-n-integer" name="Base-N Integer" map-to="def:base-n-integer"/>
+    <style id="decimal" name="Decimal" map-to="def:decimal"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="floating-point" name="Floating Point number" map-to="def:floating-point"/>
+    <style id="special-var" name="Module name, Variant, etc" map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/sparql.lang b/data/language-specs/sparql.lang
index 6fbac23..6b120e5 100644
--- a/data/language-specs/sparql.lang
+++ b/data/language-specs/sparql.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="sparql" _name="SPARQL" version="2.0" _section="Source">
+<language id="sparql" name="SPARQL" version="2.0" _section="Source">
 
   <metadata>
     <property name="mimetypes">application/sparql-query</property>
@@ -30,19 +29,19 @@
   </metadata>
 
   <styles>
-    <style id="class"      _name="Class"      map-to="def:type"/>
-    <style id="datatype"   _name="Data Type"  map-to="def:type"/>
-    <style id="function"   _name="Function"   map-to="def:function"/>
-    <style id="individual" _name="Individual" map-to="def:special-constant"/>
-    <style id="keyword"    _name="Keyword"    map-to="def:keyword"/>
-    <style id="namespace"  _name="Namespace"  map-to="def:builtin"/>
-    <style id="boolean"    _name="Boolean"    map-to="def:boolean"/>
-    <style id="literal"    _name="Literal"    map-to="def:string"/>
-    <style id="predicate"  _name="Predicate"  map-to="def:function"/>
-    <style id="qname"      _name="QName" />
-    <style id="iri"        _name="IRI"        map-to="def:special-constant"/>
-    <style id="var"        _name="Variable"   map-to="def:preprocessor"/>
-    <style id="operator"   _name="Operator"   map-to="def:operator"/>
+    <style id="class"      name="Class"      map-to="def:type"/>
+    <style id="datatype"   name="Data Type"  map-to="def:type"/>
+    <style id="function"   name="Function"   map-to="def:function"/>
+    <style id="individual" name="Individual" map-to="def:special-constant"/>
+    <style id="keyword"    name="Keyword"    map-to="def:keyword"/>
+    <style id="namespace"  name="Namespace"  map-to="def:builtin"/>
+    <style id="boolean"    name="Boolean"    map-to="def:boolean"/>
+    <style id="literal"    name="Literal"    map-to="def:string"/>
+    <style id="predicate"  name="Predicate"  map-to="def:function"/>
+    <style id="qname"      name="QName" />
+    <style id="iri"        name="IRI"        map-to="def:special-constant"/>
+    <style id="var"        name="Variable"   map-to="def:preprocessor"/>
+    <style id="operator"   name="Operator"   map-to="def:operator"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/sql.lang b/data/language-specs/sql.lang
index b1b9dcd..bd23c2f 100644
--- a/data/language-specs/sql.lang
+++ b/data/language-specs/sql.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="sql" _name="SQL" version="2.0" _section="Source">
+<language id="sql" name="SQL" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-sql</property>
     <property name="globs">*.sql</property>
@@ -29,14 +28,14 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="floating-point" _name="Floating Point" map-to="def:floating-point"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="function" _name="Function" map-to="def:function"/>
-    <style id="decimal" _name="Decimal" map-to="def:decimal"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="some-thing" _name="No idea what it is" map-to="def:preprocessor"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="floating-point" name="Floating Point" map-to="def:floating-point"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="function" name="Function" map-to="def:function"/>
+    <style id="decimal" name="Decimal" map-to="def:decimal"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="some-thing" name="No idea what it is" map-to="def:preprocessor"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/sweave.lang b/data/language-specs/sweave.lang
index 02bd44a..652f21b 100644
--- a/data/language-specs/sweave.lang
+++ b/data/language-specs/sweave.lang
@@ -16,22 +16,21 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
-<language id="sweave" _name="Sweave" version="2.0" _section="Markup">
+<language id="sweave" name="Sweave" version="2.0" _section="Markup">
   <metadata>
     <property name="globs">*.rnw;*.Rnw;*.snw;*.Snw</property>
     <property name="line-comment-start">%</property>
   </metadata>
 
   <styles>
-    <style id="comment"            _name="Comment"    map-to="latex:comment"/>
-    <style id="command"            _name="Command"    map-to="latex:command"/>
-    <style id="verbatim"           _name="Verbatim"   map-to="latex:verbatim"/>
+    <style id="comment"            name="Comment"    map-to="latex:comment"/>
+    <style id="command"            name="Command"    map-to="latex:command"/>
+    <style id="verbatim"           name="Verbatim"   map-to="latex:verbatim"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/systemverilog.lang b/data/language-specs/systemverilog.lang
index be7d95e..15e9085 100644
--- a/data/language-specs/systemverilog.lang
+++ b/data/language-specs/systemverilog.lang
@@ -14,12 +14,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="systemverilog" _name="SystemVerilog" version="2.0" _section="Source">
+<language id="systemverilog" name="SystemVerilog" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.sv;*.svh</property>
     <property name="line-comment-start">//</property>
@@ -28,10 +27,10 @@
   </metadata>
 
   <styles>
-    <style id="compiler-directive" _name="Compiler Directive" map-to="def:preprocessor"/>
-    <style id="system-task" _name="System Task" map-to="def:keyword"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="type" _name="Type" map-to="def:type"/>
+    <style id="compiler-directive" name="Compiler Directive" map-to="def:preprocessor"/>
+    <style id="system-task" name="System Task" map-to="def:keyword"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="type" name="Type" map-to="def:type"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/t2t.lang b/data/language-specs/t2t.lang
index 0c96048..10912b1 100644
--- a/data/language-specs/t2t.lang
+++ b/data/language-specs/t2t.lang
@@ -16,33 +16,32 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="t2t" _name="txt2tags" version="2.0" _section="Markup">
+<language id="t2t" name="txt2tags" version="2.0" _section="Markup">
   <metadata>
     <property name="globs">*.t2t</property>
     <property name="line-comment-start">%</property>
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment"/>
-    <style id="option" _name="Option"/>
-    <style id="option-name" _name="Option Name" map-to="def:keyword"/>
-    <style id="header" _name="Header" map-to="def:keyword"/>
-    <style id="section" _name="Section" map-to="def:keyword"/>
-    <style id="section-1" _name="Section 1" map-to="t2t:section"/>
-    <style id="section-2" _name="Section 2" map-to="t2t:section"/>
-    <style id="section-3" _name="Section 3" map-to="t2t:section"/>
-    <style id="section-4" _name="Section 4" map-to="t2t:section"/>
-    <style id="section-5" _name="Section 5" map-to="t2t:section"/>
-    <style id="anchor" _name="Anchor" map-to="t2t:section"/>
-    <style id="italic" _name="Italic"/>
-    <style id="bold" _name="Bold"/>
-    <style id="verbatim" _name="Verbatim"/>
-    <style id="verbatim-block" _name="Verbatim Block"/>
+    <style id="comment" name="Comment"/>
+    <style id="option" name="Option"/>
+    <style id="option-name" name="Option Name" map-to="def:keyword"/>
+    <style id="header" name="Header" map-to="def:keyword"/>
+    <style id="section" name="Section" map-to="def:keyword"/>
+    <style id="section-1" name="Section 1" map-to="t2t:section"/>
+    <style id="section-2" name="Section 2" map-to="t2t:section"/>
+    <style id="section-3" name="Section 3" map-to="t2t:section"/>
+    <style id="section-4" name="Section 4" map-to="t2t:section"/>
+    <style id="section-5" name="Section 5" map-to="t2t:section"/>
+    <style id="anchor" name="Anchor" map-to="t2t:section"/>
+    <style id="italic" name="Italic"/>
+    <style id="bold" name="Bold"/>
+    <style id="verbatim" name="Verbatim"/>
+    <style id="verbatim-block" name="Verbatim Block"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/tcl.lang b/data/language-specs/tcl.lang
index a2f41c8..31d2805 100644
--- a/data/language-specs/tcl.lang
+++ b/data/language-specs/tcl.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="tcl" _name="Tcl" version="2.0" _section="Script">
+<language id="tcl" name="Tcl" version="2.0" _section="Script">
   <metadata>
     <property name="mimetypes">text/x-tcl;application/x-tcl</property>
     <property name="globs">*.tcl;*.tk</property>
@@ -29,8 +28,8 @@
   </metadata>
 
   <styles>
-    <style id="variable" _name="Variable" map-to="def:type"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
+    <style id="variable" name="Variable" map-to="def:type"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/texinfo.lang b/data/language-specs/texinfo.lang
index 028aff2..b596c85 100644
--- a/data/language-specs/texinfo.lang
+++ b/data/language-specs/texinfo.lang
@@ -16,13 +16,12 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 <!-- converted to new lang file format with convert.py -->
-<language id="texinfo" _name="Texinfo" version="2.0" _section="Markup">
+<language id="texinfo" name="Texinfo" version="2.0" _section="Markup">
   <metadata>
     <property name="mimetypes">text/x-texinfo</property>
     <property name="globs">*.texi;*.texinfo</property>
@@ -30,15 +29,15 @@
   </metadata>
 
   <styles>
-    <style id="comment"           _name="Comment"           map-to="def:comment"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="others"            _name="Others"/>
-    <style id="string"            _name="String"            map-to="def:string"/>
-    <style id="keyword"           _name="Keyword"           map-to="def:keyword"/>
-    <style id="macros"            _name="Macros"            map-to="def:keyword"/>
-    <style id="file-attributes"   _name="File Attributes"   map-to="def:keyword"/>
-    <style id="generated-content" _name="Generated Content" map-to="def:keyword"/>
-    <style id="include"           _name="Include"           map-to="def:preprocessor"/>
+    <style id="comment"           name="Comment"           map-to="def:comment"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
+    <style id="others"            name="Others"/>
+    <style id="string"            name="String"            map-to="def:string"/>
+    <style id="keyword"           name="Keyword"           map-to="def:keyword"/>
+    <style id="macros"            name="Macros"            map-to="def:keyword"/>
+    <style id="file-attributes"   name="File Attributes"   map-to="def:keyword"/>
+    <style id="generated-content" name="Generated Content" map-to="def:keyword"/>
+    <style id="include"           name="Include"           map-to="def:preprocessor"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/thrift.lang b/data/language-specs/thrift.lang
index 51d72f2..b37db1d 100644
--- a/data/language-specs/thrift.lang
+++ b/data/language-specs/thrift.lang
@@ -13,12 +13,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="thrift" _name="Thrift" version="2.0" _section="Source">
+<language id="thrift" name="Thrift" version="2.0" _section="Source">
   <metadata>
     <property name="globs">*.thrift</property>
     <property name="line-comment-start">//</property>
@@ -27,10 +26,10 @@
   </metadata>
 
   <styles>
-    <style id="comment"     _name="Comment"      map-to="def:comment"/>
-    <style id="type"        _name="Data Type"    map-to="def:type"/>
-    <style id="keyword"     _name="Keyword"      map-to="def:keyword"/>
-    <style id="string"      _name="String"       map-to="def:string"/>
+    <style id="comment"     name="Comment"      map-to="def:comment"/>
+    <style id="type"        name="Data Type"    map-to="def:type"/>
+    <style id="keyword"     name="Keyword"      map-to="def:keyword"/>
+    <style id="string"      name="String"       map-to="def:string"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/vala.lang b/data/language-specs/vala.lang
index 03f98e0..da22dc5 100644
--- a/data/language-specs/vala.lang
+++ b/data/language-specs/vala.lang
@@ -20,12 +20,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="vala" _name="Vala" version="2.0" _section="Source">
+<language id="vala" name="Vala" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-vala</property>
     <property name="globs">*.vala;*.vapi</property>
@@ -35,18 +34,18 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="null-value" _name="Null Value" map-to="def:special-constant"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="null-value" name="Null Value" map-to="def:special-constant"/>
     <style id="directive" name="Directives" map-to="def:preprocessor"/>
     <style id="attributes" name="Vala Attributes" map-to="def:function"/>
     <style id="string-template" name="Vala String template" map-to="def:function"/>
-    <style id="regex" _name="Regular Expression" map-to="def:string"/>
-    <style id="escape" _name="Escaped Character" map-to="def:special-char"/>
+    <style id="regex" name="Regular Expression" map-to="def:string"/>
+    <style id="escape" name="Escaped Character" map-to="def:special-char"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/vbnet.lang b/data/language-specs/vbnet.lang
index a53f137..1a3113d 100644
--- a/data/language-specs/vbnet.lang
+++ b/data/language-specs/vbnet.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="vbnet" _name="VB.NET" version="2.0" _section="Source">
+<language id="vbnet" name="VB.NET" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-vbnet;text/x-vb</property>
     <property name="globs">*.vb</property>
@@ -29,13 +28,13 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="preprocessor" _name="Preprocessor" map-to="def:preprocessor"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="type" _name="Data Type" map-to="def:type"/>
-    <style id="special-constant" _name="Special constant" map-to="def:special-constant"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="preprocessor" name="Preprocessor" map-to="def:preprocessor"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="type" name="Data Type" map-to="def:type"/>
+    <style id="special-constant" name="Special constant" map-to="def:special-constant"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/verilog.lang b/data/language-specs/verilog.lang
index a5378e6..2e4df9e 100644
--- a/data/language-specs/verilog.lang
+++ b/data/language-specs/verilog.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="verilog" _name="Verilog" version="2.0" _section="Source">
+<language id="verilog" name="Verilog" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-verilog-src</property>
     <property name="globs">*.v</property>
@@ -31,20 +30,20 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="printf" _name="printf Conversion" map-to="def:special-char"/>
-    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
-    <style id="error" _name="Error" map-to="def:error"/>
-    <style id="compiler-directive" _name="Compiler Directive" map-to="def:preprocessor"/>
-    <style id="ieee-system-task" _name="IEEE System Task" map-to="def:keyword"/>
-    <style id="lrm-additional-system-task" _name="LRM Additional System Task" map-to="def:keyword"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="gate" _name="Gate" map-to="def:keyword"/>
-    <style id="type" _name="Type" map-to="def:type"/>
-    <style id="base-n-integer" _name="Base-N Integer" map-to="def:base-n-integer"/>
-    <style id="real-number" _name="Real number" map-to="def:floating-point"/>
-    <style id="integer-number" _name="Integer Number" map-to="def:number"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="printf" name="printf Conversion" map-to="def:special-char"/>
+    <style id="escaped-character" name="Escaped Character" map-to="def:special-char"/>
+    <style id="error" name="Error" map-to="def:error"/>
+    <style id="compiler-directive" name="Compiler Directive" map-to="def:preprocessor"/>
+    <style id="ieee-system-task" name="IEEE System Task" map-to="def:keyword"/>
+    <style id="lrm-additional-system-task" name="LRM Additional System Task" map-to="def:keyword"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="gate" name="Gate" map-to="def:keyword"/>
+    <style id="type" name="Type" map-to="def:type"/>
+    <style id="base-n-integer" name="Base-N Integer" map-to="def:base-n-integer"/>
+    <style id="real-number" name="Real number" map-to="def:floating-point"/>
+    <style id="integer-number" name="Integer Number" map-to="def:number"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/vhdl.lang b/data/language-specs/vhdl.lang
index ebcbed1..5583d0c 100644
--- a/data/language-specs/vhdl.lang
+++ b/data/language-specs/vhdl.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="vhdl" _name="VHDL" version="2.0" _section="Source">
+<language id="vhdl" name="VHDL" version="2.0" _section="Source">
   <metadata>
     <property name="mimetypes">text/x-vhdl</property>
     <property name="globs">*.vhd</property>
@@ -29,15 +28,15 @@
   </metadata>
 
   <styles>
-    <style id="comment" _name="Comment" map-to="def:comment"/>
-    <style id="string" _name="String" map-to="def:string"/>
-    <style id="character" _name="Character" map-to="def:character"/>
-    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
-    <style id="type" _name="Type" map-to="def:type"/>
-    <style id="boolean" _name="Boolean value" map-to="def:boolean"/>
-    <style id="base-n-number" _name="Base-N Integer" map-to="def:base-n-integer"/>
-    <style id="real" _name="Real number" map-to="def:floating-point"/>
-    <style id="number" _name="Number" map-to="def:number"/>
+    <style id="comment" name="Comment" map-to="def:comment"/>
+    <style id="string" name="String" map-to="def:string"/>
+    <style id="character" name="Character" map-to="def:character"/>
+    <style id="keyword" name="Keyword" map-to="def:keyword"/>
+    <style id="type" name="Type" map-to="def:type"/>
+    <style id="boolean" name="Boolean value" map-to="def:boolean"/>
+    <style id="base-n-number" name="Base-N Integer" map-to="def:base-n-integer"/>
+    <style id="real" name="Real number" map-to="def:floating-point"/>
+    <style id="number" name="Number" map-to="def:number"/>
   </styles>
 
   <default-regex-options case-sensitive="false"/>
diff --git a/data/language-specs/xml.lang b/data/language-specs/xml.lang
index c148b3e..8fd7d3e 100644
--- a/data/language-specs/xml.lang
+++ b/data/language-specs/xml.lang
@@ -18,12 +18,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="xml" _name="XML" version="2.0" _section="Markup">
+<language id="xml" name="XML" version="2.0" _section="Markup">
     <metadata>
         <property name="mimetypes">application/xml;text/xml</property>
         <property 
name="globs">*.xml;*.xspf;*.siv;*.smil;*.smi;*.sml;*.kino;*.xul;*.xbel;*.abw;*.zabw;*.glade;*.jnlp;*.xhtml;*.svg;*.mml;*.rdf;*.rss;*.wml;*.xmi;*.fo;*.xslfo</property>
@@ -32,17 +31,17 @@
     </metadata>
 
     <styles>
-        <style id="comment"                 _name="Comment"                 map-to="def:comment"/>
-        <style id="doctype"                 _name="DOCTYPE"                 map-to="def:preprocessor"/>
-        <style id="cdata-delim"             _name="CDATA delimiter"         map-to="def:preprocessor"/>
-        <style id="processing-instruction"  _name="Processing instruction"  map-to="def:preprocessor"/>
-        <style id="element-name"            _name="Element name"            map-to="def:identifier"/>
-        <style id="attribute-name"          _name="Attribute name"          map-to="def:type"/>
-        <style id="attribute-value"         _name="Attribute value"         map-to="def:string"/>
-        <style id="entity"                  _name="Entity"                  map-to="def:preprocessor"/>
-        <style id="tag"                     _name="Tag"/>
-        <style id="namespace"               _name="Namespace"               map-to="xml:element-name"/>
-        <style id="error"                   _name="Error"                   map-to="def:error"/>
+        <style id="comment"                 name="Comment"                 map-to="def:comment"/>
+        <style id="doctype"                 name="DOCTYPE"                 map-to="def:preprocessor"/>
+        <style id="cdata-delim"             name="CDATA delimiter"         map-to="def:preprocessor"/>
+        <style id="processing-instruction"  name="Processing instruction"  map-to="def:preprocessor"/>
+        <style id="element-name"            name="Element name"            map-to="def:identifier"/>
+        <style id="attribute-name"          name="Attribute name"          map-to="def:type"/>
+        <style id="attribute-value"         name="Attribute value"         map-to="def:string"/>
+        <style id="entity"                  name="Entity"                  map-to="def:preprocessor"/>
+        <style id="tag"                     name="Tag"/>
+        <style id="namespace"               name="Namespace"               map-to="xml:element-name"/>
+        <style id="error"                   name="Error"                   map-to="def:error"/>
     </styles>
 
     <definitions>
diff --git a/data/language-specs/xslt.lang b/data/language-specs/xslt.lang
index d942191..4179310 100644
--- a/data/language-specs/xslt.lang
+++ b/data/language-specs/xslt.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="xslt" _name="XSLT" version="2.0" _section="Markup">
+<language id="xslt" name="XSLT" version="2.0" _section="Markup">
   <metadata>
     <property name="mimetypes">application/xslt+xml</property>
     <property name="globs">*.xslt;*.xsl</property>
@@ -30,8 +29,8 @@
   </metadata>
 
   <styles>
-    <style id="element" _name="Element" map-to="def:keyword"/>
-    <style id="namespace" _name="Namespace" map-to="xslt:element"/>
+    <style id="element" name="Element" map-to="def:keyword"/>
+    <style id="namespace" name="Namespace" map-to="xslt:element"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/yacc.lang b/data/language-specs/yacc.lang
index 3550e5d..3eacc37 100644
--- a/data/language-specs/yacc.lang
+++ b/data/language-specs/yacc.lang
@@ -16,12 +16,11 @@
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
 
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, see <http://www.gnu.org/licenses/>.
 
 -->
-<language id="yacc" _name="Yacc" _section="Other" version="2.0">
+<language id="yacc" name="Yacc" _section="Other" version="2.0">
   <metadata>
     <property name="mimetypes">text/x-yacc;text/x-bison</property>
     <property name="globs">*.y;*.yacc</property>
@@ -32,9 +31,9 @@
 
   <styles>
     <!--FIXME make it better names, and make them translatable -->
-    <style id="keyword" _name="keyword" map-to="def:keyword"/>
-    <style id="token-type" _name="token type" map-to="def:type"/>
-    <style id="rule" _name="rule" map-to="def:identifier"/>
+    <style id="keyword" name="keyword" map-to="def:keyword"/>
+    <style id="token-type" name="token type" map-to="def:type"/>
+    <style id="rule" name="rule" map-to="def:identifier"/>
   </styles>
 
   <definitions>
diff --git a/data/language-specs/yaml.lang b/data/language-specs/yaml.lang
index fa91949..99db2ca 100644
--- a/data/language-specs/yaml.lang
+++ b/data/language-specs/yaml.lang
@@ -15,11 +15,10 @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   Lesser General Public License for more details.
 
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+  You should have received a copy of the GNU Lesser General Public License
+  along with this library; if not, see <http://www.gnu.org/licenses/>.
 -->
-<language id="yaml" _name="YAML" _section="Other" version="2.0">
+<language id="yaml" name="YAML" _section="Other" version="2.0">
   <metadata>
     <property name="mimetypes">application/x-yaml</property>
     <property name="globs">*.yaml;*.yml;</property>
@@ -27,18 +26,18 @@
   </metadata>
 
   <styles>
-    <style id="scalar"    _name="Block literal"   map-to="def:string"/>
-    <style id="comment"   _name="Comment"         map-to="def:comment"/>
-    <style id="string"    _name="String"          map-to="def:string"/>
-    <style id="anchor"    _name="Anchor"          map-to="def:identifier"/>
-    <style id="tag"       _name="Tag"             map-to="def:preprocessor"/>
-    <style id="alias"     _name="Alias"           map-to="def:type"/>
-    <style id="map-key"   _name="Map key"         map-to="def:keyword"/>
-    <style id="directive" _name="Directive"       map-to="def:shebang"/>
-    <style id="null"      _name="Null"            map-to="def:special-constant"/>
-    <style id="bool"      _name="Boolean"         map-to="def:boolean"/>
-    <style id="int"       _name="Integer"         map-to="def:decimal"/>
-    <style id="float"     _name="Floating point"  map-to="def:floating-point"/>
+    <style id="scalar"    name="Block literal"   map-to="def:string"/>
+    <style id="comment"   name="Comment"         map-to="def:comment"/>
+    <style id="string"    name="String"          map-to="def:string"/>
+    <style id="anchor"    name="Anchor"          map-to="def:identifier"/>
+    <style id="tag"       name="Tag"             map-to="def:preprocessor"/>
+    <style id="alias"     name="Alias"           map-to="def:type"/>
+    <style id="map-key"   name="Map key"         map-to="def:keyword"/>
+    <style id="directive" name="Directive"       map-to="def:shebang"/>
+    <style id="null"      name="Null"            map-to="def:special-constant"/>
+    <style id="bool"      name="Boolean"         map-to="def:boolean"/>
+    <style id="int"       name="Integer"         map-to="def:decimal"/>
+    <style id="float"     name="Floating point"  map-to="def:floating-point"/>
   </styles>
 
   <definitions>
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 375e96c..3927763 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -48,6 +48,7 @@ data/language-specs/gdb-log.lang
 data/language-specs/genie.lang
 data/language-specs/glsl.lang
 data/language-specs/go.lang
+data/language-specs/groovy.lang
 data/language-specs/gtk-doc.lang
 data/language-specs/gtkrc.lang
 data/language-specs/haddock.lang


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]