[anjuta-extras] Update new styles to use the one defined in Anjuta

[Sebastien Granjoux <sgranjoux src gnome org>]

commit 10a600f6db490e5f5e5a5250c75e78acce5e731c
Author: Sébastien Granjoux <seb sfo free fr>
Date:   Mon Jun 5 13:38:18 2017 +0200

    Update new styles to use the one defined in Anjuta

 plugins/scintilla/properties/styles.properties |  458 ++++++++++++------------
 1 files changed, 229 insertions(+), 229 deletions(-)
---
diff --git a/plugins/scintilla/properties/styles.properties b/plugins/scintilla/properties/styles.properties
index c9a656f..620eeef 100644
--- a/plugins/scintilla/properties/styles.properties
+++ b/plugins/scintilla/properties/styles.properties
@@ -8539,35 +8539,35 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Style for as from file asm.properties
 
 #
-       style.as.1=$(style.asm.1)
+       style.as.1=$(style.anjuta.comment)
 #
-       style.as.2=$(style.asm.2)
+       style.as.2=$(style.anjuta.number)
 #
-       style.as.3=$(style.asm.3)
+       style.as.3=$(style.anjuta.string)
 #
-       style.as.4=$(style.asm.4)
+       style.as.4=$(style.anjuta.operator)
 #
-       style.as.5=$(style.asm.5)
+       style.as.5=$(style.anjuta.identifier)
 #
-       style.as.6=$(style.asm.6)
+       style.as.6=$(style.anjuta.keyword)
 #
-       style.as.7=$(style.asm.7)
+       style.as.7=$(style.anjuta.localkeyword)
 #
-       style.as.8=$(style.asm.8)
+       style.as.8=$(style.anjuta.identifier)
 #
-       style.as.9=$(style.asm.9)
+       style.as.9=$(style.anjuta.preprocessor)
 #
-       style.as.10=$(style.asm.10)
+       style.as.10=$(style.anjuta.preprocessor)
 #
-       style.as.11=$(style.asm.11)
+       style.as.11=$(style.anjuta.comment)
 #
-       style.as.12=$(style.asm.12)
+       style.as.12=$(style.anjuta.char)
 #
-       style.as.13=$(style.asm.13)
+       style.as.13=$(style.anjuta.unclosed)
 #
-       style.as.14=$(style.asm.14)
+       style.as.14=$(style.anjuta.syskeyword)
 #
-       style.as.15=$(style.asm.15)
+       style.as.15=$(style.anjuta.preprocessor)
 
 
 
@@ -8575,7 +8575,7 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Style for asm from file asm.properties
 
 #
-       style.asm.0=$(style.asm.0)
+       style.asm.0=$(style.anjuta.normal)
 # Comment
        style.asm.1=$(style.anjuta.comment)
 # Number
@@ -8603,7 +8603,7 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Extended instructions
        style.asm.14=$(style.anjuta.syskeyword)
 # Comment directive
-       style.asm.15=fore:#66AA00
+       style.asm.15=$(style.anjuta.preprocessor)
 
 
 
@@ -8669,7 +8669,7 @@ keywords.$(file.patterns.yaml)=true false yes no
 # COM Object
        style.au3.14=$(style.anjuta.attribute)
 # Standard UDF
-       style.au3.15=fore:#0080FF
+       style.au3.15=$(style.anjuta.syskeyword)
 
 
 
@@ -8695,7 +8695,7 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Operators
        style.ave.10=$(style.anjuta.operator)
 # SCE_AVE_WORD1 allocated but unused
-       style.ave.11=back:#FF0000
+       style.ave.11=$(style.anjuta.preprocessor)
 # Other keywords (bozo test colors :-)
        style.ave.12=$(style.anjuta.localkeyword)
 #
@@ -8769,33 +8769,33 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Keywords2 ~ Functions
        style.baan.10=$(style.anjuta.localkeyword)
 # Keywords3 ~ Functions Abridged
-       style.baan.11=$(colour.baan.keyword3),$(font.baan.monospace),bold
+       style.baan.11=$(style.anjuta.localkeyword)
 # Keywords4 ~ Sections
-       style.baan.12=$(colour.baan.keyword4),$(font.baan.monospace),bold
+       style.baan.12=$(style.anjuta.definition)
 # Keywords5 ~ Predefined Variables
-       style.baan.13=$(colour.baan.keyword5),$(font.baan.monospace),bold
+       style.baan.13=$(style.anjuta.char)
 # Keywords6 ~ Attributes Predefined
-       style.baan.14=$(colour.baan.keyword6),$(font.baan.monospace),bold
+       style.baan.14=$(style.anjuta.attribute)
 # Keywords7
-       style.baan.15=$(colour.baan.keyword7),$(font.baan.monospace),bold
+       style.baan.15=$(style.anjuta.extrakeyword)
 # Keywords8
-       style.baan.16=$(colour.baan.keyword8),$(font.baan.monospace),bold
+       style.baan.16=$(style.anjuta.extrakeyword)
 # Keywords9
-       style.baan.17=$(colour.baan.keyword9),$(font.baan.monospace),bold
+       style.baan.17=$(style.anjuta.extrakeyword)
 # TableDef
-       style.baan.18=$(colour.baan.tabledef),$(font.baan.monospace),bold
+       style.baan.18=$(style.anjuta.definition)
 # TableSQL
-       style.baan.19=$(colour.baan.tablesql),$(font.baan.monospace),bold
+       style.baan.19=$(style.anjuta.definition)
 # Functions
-       style.baan.20=$(colour.baan.functions),$(font.baan.monospace),bold
+       style.baan.20=$(style.anjuta.function)
 # DomainDef
-       style.baan.21=$(colour.baan.domaindef),$(font.baan.monospace),bold
+       style.baan.21=$(style.anjuta.function)
 # FunctionDef
-       style.baan.22=$(colour.baan.funcdefs),$(font.baan.monospace),bold
+       style.baan.22=$(style.anjuta.function)
 # ObjectDef used in #include and #pragma used dll
-       style.baan.23=$(colour.baan.objdefs),$(font.baan.monospace),bold
+       style.baan.23=$(style.anjuta.preprocessor)
 # DefineDef used in #define 
-       style.baan.24=$(colour.baan.definedefs),$(font.baan.monospace),bold
+       style.baan.24=$(style.anjuta.preprocessor)
 
 
 
@@ -8991,55 +8991,55 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Style for coffeescript from file coffeescript.properties
 
 # White space
-       style.coffeescript.0=fore:#808080
+       style.coffeescript.0=$(style.anjuta.whitespace)
 # SCE_COFFEESCRIPT_COMMENT allocated but unused
-       style.coffeescript.1=$(colour.code.comment.box),$(font.code.comment.box)
+       style.coffeescript.1=$(style.anjuta.comment)
 # Line Comment
-       style.coffeescript.2=$(colour.code.comment.line),$(font.code.comment.line)
+       style.coffeescript.2=$(style.anjuta.comment)
 # SCE_COFFEESCRIPT_COMMENTDOC allocated but unused
-       style.coffeescript.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+       style.coffeescript.3=$(style.anjuta.comment)
 # Number
-       style.coffeescript.4=$(colour.number)
+       style.coffeescript.4=$(style.anjuta.number)
 # Keyword
-       style.coffeescript.5=$(colour.keyword),bold
+       style.coffeescript.5=$(style.anjuta.keyword)
 # Double quoted string
-       style.coffeescript.6=$(colour.string)
+       style.coffeescript.6=$(style.anjuta.string)
 # Single quoted string
-       style.coffeescript.7=$(colour.char)
+       style.coffeescript.7=$(style.anjuta.char)
 # SCE_COFFEESCRIPT_UUID allocated but unused
-       style.coffeescript.8=fore:#804080
+       style.coffeescript.8=$(style.anjuta.attribute)
 # SCE_COFFEESCRIPT_PREPROCESSOR allocated but unused
-       style.coffeescript.9=$(colour.preproc)
+       style.coffeescript.9=$(style.anjuta.preprocessor)
 # Operators
-       style.coffeescript.10=$(colour.operator),bold
+       style.coffeescript.10=$(style.anjuta.operator)
 # SCE_COFFEESCRIPT_STRINGEOL allocated but unused
-       style.coffeescript.12=fore:#000000,$(font.monospace),back:#E0C0E0,eolfilled
+       style.coffeescript.12=$(style.anjuta.string)
 # SCE_COFFEESCRIPT_VERBATIM allocated but unused
-       style.coffeescript.13=fore:#007F00,$(font.monospace),back:#E0FFE0,eolfilled
+       style.coffeescript.13=$(style.anjuta.string)
 # Regular expressions
-       style.coffeescript.14=fore:#3F7F3F,$(font.monospace),back:#E0F0FF,eolfilled
+       style.coffeescript.14=$(style.anjuta.regex)
 # SCE_COFFEESCRIPT_COMMENTLINEDOC allocated but unused
-       style.coffeescript.15=$(colour.code.comment.doc),$(font.code.comment.doc)
+       style.coffeescript.15=$(style.anjuta.comment)
 # Keywords2
-       style.coffeescript.16=fore:#B00040
+       style.coffeescript.16=$(style.anjuta.localkeyword)
 # SCE_COFFEESCRIPT_COMMENTDOCKEYWORD allocated but unused
-       style.coffeescript.17=fore:#3060A0,$(font.code.comment.doc)
+       style.coffeescript.17=$(style.anjuta.comment)
 # SCE_COFFEESCRIPT_COMMENTDOCKEYWORDERROR allocated but unused
-       style.coffeescript.18=fore:#804020,$(font.code.comment.doc)
+       style.coffeescript.18=$(style.anjuta.comment)
 # Global class
-       style.coffeescript.19=fore:#DD9900
+       style.coffeescript.19=$(style.anjuta.definition)
 # SCE_COFFEESCRIPT_STRINGRAW allocated but unused
-       style.coffeescript.20=$(colour.string),back:#FFF3FF,eolfilled
+       style.coffeescript.20=$(style.anjuta.string)
 # SCE_COFFEESCRIPT_TRIPLEVERBATIM allocated but unused
-       style.coffeescript.21=$(font.monospace),fore:#007F00,back:#E0FFE0,eolfilled
+       style.coffeescript.21=$(style.anjuta.string)
 # Comment block ###
-       style.coffeescript.22=$(font.monospace),fore:#007F00,back:#E7FFD7,eolfilled
+       style.coffeescript.22=$(style.anjuta.comment)
 # Verbose REGEX
-       style.coffeescript.23=fore:#659900
+       style.coffeescript.23=$(style.anjuta.regex)
 # Verbose REGEX comment
-       style.coffeescript.24=$(colour.code.comment.doc)
+       style.coffeescript.24=$(style.anjuta.comment)
 # Iinstance property
-       style.coffeescript.25=fore:#C06000
+       style.coffeescript.25=$(style.anjuta.attribute)
 
 
 
@@ -9121,11 +9121,11 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Preprocessor stream doc comment
        style.cpp.24=$(style.anjuta.preprocessor)
 # User defined literals
-       style.cpp.25=fore:#C06000
+       style.cpp.25=$(style.anjuta.number)
 # Task Marker
-       style.cpp.26=fore:#BE07FF,$(font.code.comment.line)
+       style.cpp.26=$(style.anjuta.attribute)
 # Escape sequence
-       style.cpp.27=$(colour.string)
+       style.cpp.27=$(style.anjuta.string)
 # White space
        style.cpp.64=$(style.anjuta.whitespace)
 # Comment: /* */.
@@ -9175,9 +9175,9 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Preprocessor stream doc comment
        style.cpp.88=$(style.anjuta.preprocessor)
 # User defined literals
-       style.cpp.89=fore:#D7A090
+       style.cpp.89=$(style.anjuta.number)
 # Task Marker
-       style.cpp.90=fore:#C3A1CF,$(font.code.comment.line)
+       style.cpp.90=$(style.anjuta.attribute)
 
 
 
@@ -9265,7 +9265,7 @@ keywords.$(file.patterns.yaml)=true false yes no
 # "@media"
        style.css.22=$(style.anjuta.identifier)
 # Variable in SCSS, LESS, or HSS
-       style.css.23=fore:#DD9900
+       style.css.23=$(style.anjuta.identifier)
 
 
 
@@ -9307,15 +9307,15 @@ keywords.$(file.patterns.yaml)=true false yes no
 #
        style.d.17=$(style.anjuta.comment)
 #
-       style.d.18=fore:#DD9900
+       style.d.18=$(style.anjuta.string)
 #
-       style.d.19=fore:#DD9900
+       style.d.19=$(style.anjuta.string)
 #
-       style.d.20=fore:#DD9900
+       style.d.20=$(style.anjuta.keyword)
 #
-       style.d.21=fore:#DD9900
+       style.d.21=$(style.anjuta.keyword)
 #
-       style.d.22=fore:#DD9900
+       style.d.22=$(style.anjuta.keyword)
 
 
 
@@ -9503,7 +9503,7 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Module attributes
        style.erlang.24=$(style.anjuta.definition)
 # Unknown: error
-       style.erlang.31=back:#FF0000
+       style.erlang.31=$(style.anjuta.error)
 
 
 
@@ -9557,9 +9557,9 @@ keywords.$(file.patterns.yaml)=true false yes no
 # GCC showing include path to following error
        style.errorlist.22=$(style.anjuta.error)
 # Escape sequence
-       style.errorlist.23=fore:#000000,notvisible,back:#FFFFFF,$(error.background)
+       style.errorlist.23=$(style.anjuta.string)
 # Escape sequence unknown
-       style.errorlist.24=back:#FFE0A0
+       style.errorlist.24=$(style.anjuta.string)
 # Basic colours
        style.errorlist.40=fore:#000000,$(error.background)
 #
@@ -9859,15 +9859,15 @@ keywords.$(file.patterns.yaml)=true false yes no
 # character
        style.haskell.5=$(style.anjuta.char)
 # class: error not implemented
-       style.haskell.6=back:#FF0000
+       style.haskell.6=$(style.anjuta.error)
 # data: error not implemented
-       style.haskell.9=back:#FF0000
+       style.haskell.9=$(style.anjuta.error)
 # import: error not implemented
-       style.haskell.10=back:#FF0000
+       style.haskell.10=$(style.anjuta.error)
 # operator
        style.haskell.11=$(style.anjuta.operator)
 # instance: error not implemented
-       style.haskell.12=back:#FF0000
+       style.haskell.12=$(style.anjuta.error)
 # line comment
        style.haskell.13=$(style.anjuta.comment)
 # block comment
@@ -9883,11 +9883,11 @@ keywords.$(file.patterns.yaml)=true false yes no
 # End of line where string is not closed
        style.haskell.19=$(style.anjuta.error)
 # Reserved operator
-       style.haskell.20=back:#FF8080
+       style.haskell.20=$(style.anjuta.operator)
 # Literate comment
-       style.haskell.21=fore:#DD9900,$(font.code.comment.line),italics
+       style.haskell.21=$(style.anjuta.comment)
 # Literate delimiter
-       style.haskell.22=fore:#EE00AA
+       style.haskell.22=$(style.anjuta.number)
 
 
 
@@ -9955,7 +9955,7 @@ keywords.$(file.patterns.yaml)=true false yes no
 # SGML comment
        style.hypertext.29=$(style.anjuta.comment)
 # SGML first parameter - lexer internal. It is an error if any text is in this style.
-       style.hypertext.30=fore:#808000,back:#FF0000
+       style.hypertext.30=$(style.anjuta.preprocessor)
 # SGML block
        style.hypertext.31=$(style.anjuta.preprocessor)
 # JS Start - allows eol filled background to not start on same line as SCRIPT tag
@@ -10119,41 +10119,41 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Style for ihex from file hex.properties
 
 # Same color scheme as above, comments when differing
-       style.ihex.0=$(style.srec.0)
+       style.ihex.0=$(style.anjuta.normal)
 # Record start ':'
-       style.ihex.1=$(style.srec.1)
+       style.ihex.1=$(style.anjuta.attribute)
 #
-       style.ihex.2=$(style.srec.2)
+       style.ihex.2=$(style.anjuta.attribute)
 #
-       style.ihex.3=$(style.srec.3)
+       style.ihex.3=$(style.anjuta.attribute)
 #
-       style.ihex.4=$(style.srec.4)
+       style.ihex.4=$(style.anjuta.attribute)
 #
-       style.ihex.5=$(style.srec.5)
+       style.ihex.5=$(style.anjuta.attribute)
 #
-       style.ihex.6=$(style.srec.6)
+       style.ihex.6=$(style.anjuta.attribute)
 #
-       style.ihex.7=$(style.srec.7)
+       style.ihex.7=$(style.anjuta.attribute)
 # Data field: Start address
-       style.ihex.9=$(style.srec.9)
+       style.ihex.9=$(style.anjuta.number)
 # Address field: Type unknown (4 digits as usual)
-       style.ihex.10=$(style.srec.10)
+       style.ihex.10=$(style.anjuta.error)
 # Data field: Extended address
-       style.ihex.11=$(style.ihex.9)
+       style.ihex.11=$(style.anjuta.number)
 #
-       style.ihex.12=$(style.srec.12)
+       style.ihex.12=$(style.anjuta.number)
 #
-       style.ihex.13=$(style.srec.13)
+       style.ihex.13=$(style.anjuta.number)
 # Data field: Type unknown
-       style.ihex.14=$(style.srec.14)
+       style.ihex.14=$(style.anjuta.char)
 #
-       style.ihex.15=$(style.srec.15)
+       style.ihex.15=$(style.anjuta.char)
 #
-       style.ihex.16=$(style.srec.16)
+       style.ihex.16=$(style.anjuta.char)
 #
-       style.ihex.17=$(style.srec.17)
+       style.ihex.17=$(style.anjuta.char)
 #
-       style.ihex.18=$(style.srec.18)
+       style.ihex.18=$(style.anjuta.char)
 
 
 
@@ -10183,7 +10183,7 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Single quoted string
        style.inno.11=$(style.anjuta.char)
 # Identifier - lexer internal. It is an error if any text is in this style.
-       style.inno.12=back:#FF0000
+       style.inno.12=$(style.anjuta.error)
 
 
 
@@ -10191,33 +10191,33 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Style for json from file json.properties
 
 # Default
-       style.json.0=fore:FFFFFF
+       style.json.0=$(style.anjuta.normal)
 # Number
-       style.json.1=fore:#007F7F
+       style.json.1=$(style.anjuta.number)
 # String
-       style.json.2=fore:#7F0000
+       style.json.2=$(style.anjuta.string)
 # Unclosed string
-       style.json.3=fore:#FFFFFF,back:#FF0000,eolfilled
+       style.json.3=$(style.anjuta.error)
 # Property name
-       style.json.4=fore:#880AE8
+       style.json.4=$(style.anjuta.attribute)
 # Escape sequence
-       style.json.5=fore:#0B982E
+       style.json.5=$(style.anjuta.string)
 # Line comment
-       style.json.6=fore:#05BBAE,italics
+       style.json.6=$(style.anjuta.comment)
 # Block comment
-       style.json.7=$(style.json.6)
+       style.json.7=$(style.anjuta.comment)
 # Operator
-       style.json.8=fore:#18644A
+       style.json.8=$(style.anjuta.operator)
 # URL/IRI
-       style.json.9=fore:#0000FF
+       style.json.9=$(style.anjuta.syskeyword)
 # JSON-LD compact IRI
-       style.json.10=fore:#D137C1
+       style.json.10=$(style.anjuta.keyword)
 # JSON keyword
-       style.json.11=fore:#0BCEA7,bold
+       style.json.11=$(style.anjuta.keyword)
 # JSON-LD keyword
-       style.json.12=fore:#EC2806
+       style.json.12=$(style.anjuta.keyword)
 # Parsing error
-       style.json.13=fore:#FFFFFF,back:#FF0000
+       style.json.13=$(style.anjuta.error)
 
 
 
@@ -10245,7 +10245,7 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Operator
        style.kix.9=$(style.anjuta.operator)
 # Stream comment
-       style.kix.10=$(colour.code.comment.box),$(font.code.comment.box)
+       style.kix.10=$(style.anjuta.comment)
 
 
 
@@ -10293,9 +10293,9 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Keyword
        style.lisp.3=$(style.anjuta.keyword)
 # Keyword 2
-       style.lisp.4=fore:#EE00AA
+       style.lisp.4=$(style.anjuta.syskeyword)
 # Symbol
-       style.lisp.5=fore:#DD9900
+       style.lisp.5=$(style.anjuta.localkeyword)
 # String
        style.lisp.6=$(style.anjuta.string)
 # End of line where string is not closed
@@ -10303,9 +10303,9 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Operators
        style.lisp.10=$(style.anjuta.operator)
 # Special
-       style.lisp.11=fore:#60AA00
+       style.lisp.11=$(style.anjuta.extrakeyword)
 # Multi-line comment
-       style.lisp.12=$(colour.code.comment.box),$(font.code.comment.box)
+       style.lisp.12=$(style.anjuta.comment)
 
 
 
@@ -10595,7 +10595,7 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Environment variable (SCE_NNCRONTAB_ENVIRONMENT)
        style.nncrontab.9=$(style.anjuta.identifier)
 # Identifier (SCE_NNCRONTAB_IDENTIFIER) - lexer internal. It is an error if any text is in this style.
-       style.nncrontab.10=back:#FF0000
+       style.nncrontab.10=$(style.anjuta.error)
 
 
 
@@ -10795,7 +10795,7 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Symbol table: *var
        style.perl.15=$(style.anjuta.identifier)
 # SCE_PL_VARIABLE_INDEXER allocated but unused
-       style.perl.16=back:#FF0000
+       style.perl.16=$(style.anjuta.error)
 # Regex: /re/ or m{re}
        style.perl.17=$(style.anjuta.regex)
 # Substitution: s/re/ore/
@@ -10889,7 +10889,7 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Keyword 7
        style.pov.15=$(style.anjuta.syskeyword)
 # Keyword 8
-       style.pov.16=$(colour.keyword),back:#E0E0E0
+       style.pov.16=$(style.anjuta.extrakeyword)
 
 
 
@@ -10963,11 +10963,11 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Comment (multi-line)
        style.powershell.13=$(style.anjuta.comment)
 # Here-string
-       style.powershell.14=fore:#7F007F,back:#DDD0DD,eolfilled,bold
+       style.powershell.14=$(style.anjuta.string)
 # Here-string single quote
-       style.powershell.15=fore:#7F007F,back:#DDD0DD,eolfilled,notbold
+       style.powershell.15=$(style.anjuta.char)
 # Comment keyword
-       style.powershell.16=fore:#3060A0
+       style.powershell.16=$(style.anjuta.comment)
 
 
 
@@ -11093,13 +11093,13 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Decorators
        style.python.15=$(style.anjuta.attribute)
 # F-String
-       style.python.16=fore:#7F007F,$(font.monospace)
+       style.python.16=$(style.anjuta.string)
 # Single quoted f-string
-       style.python.17=fore:#7F007F,$(font.monospace)
+       style.python.17=$(style.anjuta.char)
 # Triple quoted f-string
-       style.python.18=fore:#7F0000
+       style.python.18=$(style.anjuta.string)
 # Triple double quoted f-string
-       style.python.19=fore:#7F0000
+       style.python.19=$(style.anjuta.string)
 
 
 
@@ -11183,15 +11183,15 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Keyword (datatypes)
        style.rebol.23=$(style.anjuta.syskeyword)
 # Keyword 4
-       style.rebol.24=fore:#DD9900
+       style.rebol.24=$(style.anjuta.extrakeyword)
 # Keyword 5
-       style.rebol.25=fore:#DD9900
+       style.rebol.25=$(style.anjuta.extrakeyword)
 # Keyword 6
-       style.rebol.26=fore:#DD9900
+       style.rebol.26=$(style.anjuta.extrakeyword)
 # Keyword 7
-       style.rebol.27=fore:#DD9900
+       style.rebol.27=$(style.anjuta.extrakeyword)
 # Keyword 8
-       style.rebol.28=fore:#DD9900
+       style.rebol.28=$(style.anjuta.extrakeyword)
 
 
 
@@ -11199,31 +11199,31 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Style for registry from file registry.properties
 
 # Default
-       style.registry.0=fore:#000000
+       style.registry.0=$(style.anjuta.normal)
 # Comment: ;;
-       style.registry.1=$(colour.code.comment.line)
+       style.registry.1=$(style.anjuta.comment)
 # Value name: "Icon"="cmd.exe,-1"
-       style.registry.2=fore:#0000FF
+       style.registry.2=$(style.anjuta.number)
 # String
-       style.registry.3=$(colour.string)
+       style.registry.3=$(style.anjuta.string)
 # Hex digit
-       style.registry.4=fore:#7F0B0C
+       style.registry.4=$(style.anjuta.regex)
 # Value type: dword, hex(2), hex(7)
-       style.registry.5=fore:#00007F,bold
+       style.registry.5=$(style.anjuta.definition)
 # Added key, [HKLM\*\shell\notepad]
-       style.registry.6=fore:#530155
+       style.registry.6=$(style.anjuta.keyword)
 # Removed key, [-HKLM\*\shell\notepad]
-       style.registry.7=fore:#FF0000
+       style.registry.7=$(style.anjuta.syskeyword)
 # Escaped characters in strings
-       style.registry.8=fore:#7D8187,bold
+       style.registry.8=$(style.anjuta.string)
 # GUID in key path, [HKCU\{C4ACBD3E-6114-4618-904C-B206ABA9DEB0}]
-       style.registry.9=fore:#7B5F15
+       style.registry.9=$(style.anjuta.number)
 # GUID in string, @="{C4ACBD3E-6114-4618-904C-B206ABA9DEB0}"
-       style.registry.10=$(style.registry.9)
+       style.registry.10=$(style.anjuta.number)
 # Parameter: "notepad.exe %1 %*"
-       style.registry.11=fore:#0B6561
+       style.registry.11=$(style.anjuta.attribute)
 # Operators
-       style.registry.12=bold
+       style.registry.12=$(style.anjuta.operator)
 
 
 
@@ -11295,7 +11295,7 @@ keywords.$(file.patterns.yaml)=true false yes no
 # STDERR
        style.ruby.40=$(style.anjuta.definition)
 # SCE_RB_UPPER_BOUND allocated but unused
-       style.ruby.41=back:#FF0000
+       style.ruby.41=$(style.anjuta.error)
 
 
 
@@ -11303,51 +11303,51 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Style for rust from file rust.properties
 
 # Whitespace
-       style.rust.0=fore:#808080
+       style.rust.0=$(style.anjuta.whitespace)
 # Block comment
-       style.rust.1=$(colour.code.comment.box),$(font.code.comment.box)
+       style.rust.1=$(style.anjuta.comment)
 # Line comment
-       style.rust.2=$(colour.code.comment.line),$(font.code.comment.line)
+       style.rust.2=$(style.anjuta.comment)
 # Block doc comment
-       style.rust.3=$(colour.code.comment.doc),$(font.code.comment.doc)
+       style.rust.3=$(style.anjuta.comment)
 # Line doc comment
-       style.rust.4=$(colour.code.comment.doc),$(font.code.comment.doc)
+       style.rust.4=$(style.anjuta.comment)
 # Number
-       style.rust.5=$(colour.number)
+       style.rust.5=$(style.anjuta.number)
 # Keywords 1-7
-       style.rust.6=$(colour.keyword),bold
+       style.rust.6=$(style.anjuta.keyword)
 #
-       style.rust.7=$(colour.keyword),bold
+       style.rust.7=$(style.anjuta.kewyord)
 #
-       style.rust.8=$(colour.keyword)
+       style.rust.8=$(style.anjuta.syskeyword)
 #
-       style.rust.9=$(colour.keyword),bold
+       style.rust.9=$(style.anjuta.localkeyword)
 #
-       style.rust.10=$(colour.keyword),bold
+       style.rust.10=$(style.anjuta.localkeyword)
 #
-       style.rust.11=$(colour.keyword),bold
+       style.rust.11=$(style.anjuta.localkeyword)
 #
-       style.rust.12=$(colour.keyword),bold
+       style.rust.12=$(style.anjuta.localkeyword)
 # Regular string
-       style.rust.13=$(colour.string)
+       style.rust.13=$(style.anjuta.regex)
 # Raw string
-       style.rust.14=fore:#B090B0
+       style.rust.14=$(style.anjuta.string)
 # Character
-       style.rust.15=$(colour.char)
+       style.rust.15=$(style.anjuta.char)
 # Operator
-       style.rust.16=$(colour.operator),bold
+       style.rust.16=$(style.anjuta.operator)
 # Lifetime
-       style.rust.18=fore:#007F7F
+       style.rust.18=$(style.anjuta.attribute)
 # Macro
-       style.rust.19=$(colour.preproc)
+       style.rust.19=$(style.anjuta.preprocessor)
 # Lexical error
-       style.rust.20=fore:#000000,$(font.monospace),back:#E0C0E0
+       style.rust.20=$(style.anjuta.error)
 # Byte string
-       style.rust.21=$(colour.string)
+       style.rust.21=$(style.anjuta.string)
 # Raw byte string
-       style.rust.22=fore:#B090B0
+       style.rust.22=$(style.anjuta.string)
 # Byte character
-       style.rust.23=$(colour.char)
+       style.rust.23=$(style.anjuta.char)
 
 
 
@@ -11457,7 +11457,7 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Double quoted string
        style.specman.6=$(style.anjuta.string)
 # Keyword 2
-       style.specman.7=$(style.anjuta.localkeyword)
+       style.specman.7=$(style.anjuta.extrakeyword)
 # Keyword 3
        style.specman.8=$(style.anjuta.syskeyword)
 # Preprocessor
@@ -11471,7 +11471,7 @@ keywords.$(file.patterns.yaml)=true false yes no
 # HDL Signal
        style.specman.14=$(style.anjuta.attribute)
 # User defined
-       style.specman.19=back:#E0F0FF
+       style.specman.19=$(style.anjuta.localkeyword)
 
 
 
@@ -11541,9 +11541,9 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Keywords8: User Keywords 4
        style.sql.22=$(style.anjuta.extrakeyword)
 # Quoted identifier
-       style.sql.23=fore:#DD9900
+       style.sql.23=$(style.anjuta.identifier)
 # Q operator
-       style.sql.24=fore:#EE00AA
+       style.sql.24=$(style.anjuta.operator)
 
 
 
@@ -11551,35 +11551,35 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Style for srec from file hex.properties
 
 # Record start 'S'
-       style.srec.1=$(style.srec.2)
+       style.srec.1=$(style.anjuta.preprocessor)
 # Record type
-       style.srec.2=fore:#7F0000
+       style.srec.2=$(style.anjuta.attribute)
 # Record type unknown
-       style.srec.3=$(style.srec.2),$(style.srec.10)
+       style.srec.3=$(style.anjuta.extrakeyword)
 # Byte count field: Correct byte count
-       style.srec.4=fore:#7F7F00
+       style.srec.4=$(style.anjuta.number)
 # Byte count field: Wrong byte count
-       style.srec.5=$(colour.error)
+       style.srec.5=$(style.anjuta.error)
 # Address field: No address
-       style.srec.6=fore:#7F00FF
+       style.srec.6=$(style.anjuta.whitespace)
 # Address field: Data address
-       style.srec.7=fore:#007FFF
+       style.srec.7=$(style.anjuta.number)
 # Address field: Record count
-       style.srec.8=$(style.srec.6)
+       style.srec.8=$(style.anjuta.number)
 # Address field: Start address
-       style.srec.9=$(style.srec.7)
+       style.srec.9=$(style.anjuta.attribute)
 # Address field: Type unknown (this state does not contain any characters)
-       style.srec.10=italics
+       style.srec.10=$(style.anjuta.error)
 # Data odd
-       style.srec.12=bold
+       style.srec.12=$(style.anjuta.string)
 # Data field: Position unknown
-       style.srec.14=$(style.srec.10)
+       style.srec.14=$(style.anjuta.string)
 # Checksum field: Correct checksum
-       style.srec.16=fore:#00BF00
+       style.srec.16=$(style.anjuta.attribute)
 # Checksum field: Wrong checksum
-       style.srec.17=$(colour.error)
+       style.srec.17=$(style.anjuta.error)
 # Garbage data after the record
-       style.srec.18=$(style.srec.10)
+       style.srec.18=$(style.anjuta.comment)
 
 
 
@@ -11637,33 +11637,33 @@ keywords.$(file.patterns.yaml)=true false yes no
 # Style for tehex from file hex.properties
 
 # Same color scheme as above, comments when differing
-       style.tehex.0=$(style.srec.0)
+       style.tehex.0=$(style.anjuta.normal)
 # Record start '%'
-       style.tehex.1=$(style.srec.1)
+       style.tehex.1=$(style.anjuta.number)
 #
-       style.tehex.2=$(style.srec.2)
+       style.tehex.2=$(style.anjuta.number)
 #
-       style.tehex.3=$(style.srec.3)
+       style.tehex.3=$(style.anjuta.number)
 #
-       style.tehex.4=$(style.srec.4)
+       style.tehex.4=$(style.anjuta.number)
 #
-       style.tehex.5=$(style.srec.5)
+       style.tehex.5=$(style.anjuta.number)
 # .6 N/A
-       style.tehex.7=$(style.srec.7)
+       style.tehex.7=$(style.anjuta.error)
 # .8 N/A
-       style.tehex.9=$(style.srec.9)
+       style.tehex.9=$(style.anjuta.error)
 # Address field: Type unknown (9 digits as usual)
-       style.tehex.10=$(style.srec.10)
+       style.tehex.10=$(style.anjuta.keyword)
 # .11 N/A
-       style.tehex.12=$(style.srec.12)
+       style.tehex.12=$(style.anjuta.error)
 #
-       style.tehex.13=$(style.srec.13)
+       style.tehex.13=$(style.anjuta.error)
 # .15 N/A
-       style.tehex.16=$(style.srec.16)
+       style.tehex.16=$(style.anjuta.error)
 #
-       style.tehex.17=$(style.srec.17)
+       style.tehex.17=$(style.anjuta.error)
 #
-       style.tehex.18=$(style.srec.18)
+       style.tehex.18=$(style.anjuta.error)
 
 
 
@@ -11831,53 +11831,53 @@ keywords.$(file.patterns.yaml)=true false yes no
 # keywords4, User defined identifiers and tasks
        style.verilog.19=$(style.anjuta.extrakeyword)
 # comment keyword
-       style.verilog.20=fore:#2A00FF
+       style.verilog.20=$(style.anjuta.comment)
 # port declare (input output ioput)
-       style.verilog.21=fore:#7F0000
+       style.verilog.21=$(style.anjuta.definition)
 #
-       style.verilog.22=fore:#00007F
+       style.verilog.22=$(style.anjuta.definition)
 #
-       style.verilog.23=fore:#0000FF
+       style.verilog.23=$(style.anjuta.definition)
 # port connection
-       style.verilog.24=fore:#005032,bold
+       style.verilog.24=$(style.anjuta.attribute)
 # White space
-       style.verilog.64=back:#E0E0E0,eolfilled
+       style.verilog.64=$(style.anjuta.whitespace)
 #
-       style.verilog.65=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.65=$(style.anjuta.whitespace)
 #
-       style.verilog.66=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.66=$(style.anjuta.whitespace)
 #
-       style.verilog.67=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.67=$(style.anjuta.whitespace)
 #
-       style.verilog.68=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.68=$(style.anjuta.whitespace)
 #
-       style.verilog.69=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.69=$(style.anjuta.whitespace)
 #
-       style.verilog.70=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.70=$(style.anjuta.whitespace)
 #
-       style.verilog.71=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.71=$(style.anjuta.whitespace)
 #
-       style.verilog.72=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.72=$(style.anjuta.whitespace)
 #
-       style.verilog.73=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.73=$(style.anjuta.whitespace)
 #
-       style.verilog.74=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.74=$(style.anjuta.whitespace)
 #
-       style.verilog.75=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.75=$(style.anjuta.whitespace)
 #
-       style.verilog.76=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.76=$(style.anjuta.whitespace)
 #
-       style.verilog.83=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.83=$(style.anjuta.whitespace)
 #
-       style.verilog.84=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.84=$(style.anjuta.whitespace)
 #
-       style.verilog.85=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.85=$(style.anjuta.whitespace)
 #
-       style.verilog.86=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.86=$(style.anjuta.whitespace)
 #
-       style.verilog.87=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.87=$(style.anjuta.whitespace)
 #
-       style.verilog.88=back:#E0E0E0,eolfilled,fore:#808080,italics
+       style.verilog.88=$(style.anjuta.whitespace)
 
 
 
@@ -11911,7 +11911,7 @@ keywords.$(file.patterns.yaml)=true false yes no
 # User defined identifiers and tasks
        style.vhdl.14=$(style.anjuta.extrakeyword)
 # Block comment
-       style.vhdl.15=$(colour.code.comment.box),$(font.code.comment.box)
+       style.vhdl.15=$(style.anjuta.comment)
 
 
 
@@ -11997,6 +11997,6 @@ keywords.$(file.patterns.yaml)=true false yes no
 # syntax error marker
        style.yaml.8=$(style.anjuta.error)
 # operator
-       style.yaml.9=$(colour.operator)
+       style.yaml.9=$(style.anjuta.operator)