2 files changed, 50 insertions, 56 deletions
diff --git a/lib/color.tes b/lib/color.tes
index a45c646..c2a8691 100644
--- a/lib/color.tes
+++ b/lib/color.tes
@@ -1,57 +1,51 @@
-!* <r,g,b>M[color.rgb] -> Scintilla color *!
-@[color.rgb]{
-  U.bU.gU.r
-  (Q.r # Q.g*256 # Q.b*256*256)
-}
-
 0EJ-1"=
   !*
-   * The Curses RGB values are hardcoded by Scinterm
+   * The Curses BGR values are hardcoded by Scinterm
    * and do not necessarily correspond to the renditions by
    * terminal emulators.
    *!
   !* These 8 colors should be available on every system *!
-  000,000,000:M[color.rgb]U[color.black]
-  128,000,000:M[color.rgb]U[color.red]
-  000,128,000:M[color.rgb]U[color.green]
-  128,128,000:M[color.rgb]U[color.yellow]
-  000,000,128:M[color.rgb]U[color.blue]
-  128,000,128:M[color.rgb]U[color.magenta]
-  000,128,128:M[color.rgb]U[color.cyan]
-  192,192,192:M[color.rgb]U[color.white]
+  @0000000U[color.black]
+  @0000080U[color.red]
+  @0008000U[color.green]
+  @0008080U[color.yellow]
+  @0800000U[color.blue]
+  @0800080U[color.magenta]
+  @0808000U[color.cyan]
+  @0c0c0c0U[color.white]
 
   !* Light color variants, might not be available on every terminal *!
-  064,064,064:M[color.rgb]U[color.lblack]
-  255,000,000:M[color.rgb]U[color.lred]
-  000,255,000:M[color.rgb]U[color.lgreen]
-  255,255,000:M[color.rgb]U[color.lyellow]
-  000,000,255:M[color.rgb]U[color.lblue]
-  255,000,255:M[color.rgb]U[color.lmagenta]
-  000,255,255:M[color.rgb]U[color.lcyan]
-  255,255,255:M[color.rgb]U[color.lwhite]
+  @0404040U[color.lblack]
+  @00000ffU[color.lred]
+  @000ff00U[color.lgreen]
+  @000ffffU[color.lyellow]
+  @0ff0000U[color.lblue]
+  @0ff00ffU[color.lmagenta]
+  @0ffff00U[color.lcyan]
+  @0ffffffU[color.lwhite]
 |
   !*
-   * The GTK RGB values are the ones used by common terminal
+   * The GTK BGR values are the ones used by common terminal
    * emulators. This should ensure that color schemes based
    * on the 16 default colors look similar on Curses and GTK.
    *!
-  000,000,000:M[color.rgb]U[color.black]
-  205,000,000:M[color.rgb]U[color.red]
-  000,205,000:M[color.rgb]U[color.green]
-  205,205,000:M[color.rgb]U[color.yellow]
-  000,000,238:M[color.rgb]U[color.blue]
-  205,000,205:M[color.rgb]U[color.magenta]
-  000,205,205:M[color.rgb]U[color.cyan]
-  229,229,229:M[color.rgb]U[color.white]
+  @0000000U[color.black]
+  @00000cdU[color.red]
+  @000cd00U[color.green]
+  @000cdcdU[color.yellow]
+  @0ee0000U[color.blue]
+  @0cd00cdU[color.magenta]
+  @0cdcd00U[color.cyan]
+  @0e5e5e5U[color.white]
 
-  127,127,127:M[color.rgb]U[color.lblack]
-  255,000,000:M[color.rgb]U[color.lred]
-  000,255,000:M[color.rgb]U[color.lgreen]
-  255,255,000:M[color.rgb]U[color.lyellow]
-  092,092,255:M[color.rgb]U[color.lblue]
-  255,000,255:M[color.rgb]U[color.lmagenta]
-  000,255,255:M[color.rgb]U[color.lcyan]
-  255,255,255:M[color.rgb]U[color.lwhite]
+  @07f7f7fU[color.lblack]
+  @00000ffU[color.lred]
+  @000ff00U[color.lgreen]
+  @000ffffU[color.lyellow]
+  @0ff5c5cU[color.lblue]
+  @0ff00ffU[color.lmagenta]
+  @0ffff00U[color.lcyan]
+  @0ffffffU[color.lwhite]
 '
 
 !* <[[flags,]bg,]fg,style>M[color.set] *!
diff --git a/lib/colors/solarized.tes b/lib/colors/solarized.tes
index aeb9cb9..529df74 100644
--- a/lib/colors/solarized.tes
+++ b/lib/colors/solarized.tes
@@ -19,22 +19,22 @@
  *!
 0,3EJ -1,-1,7EJ !* no palette & no default colors *!
 
-000,043,054:M[color.rgb]U[color.base03]
-007,054,066:M[color.rgb]U[color.base02]
-088,110,117:M[color.rgb]U[color.base01]
-101,123,131:M[color.rgb]U[color.base00]
-131,148,150:M[color.rgb]U[color.base0]
-147,161,161:M[color.rgb]U[color.base1]
-238,232,213:M[color.rgb]U[color.base2]
-253,246,227:M[color.rgb]U[color.base3]
-181,137,000:M[color.rgb]U[color.yellow]
-203,075,022:M[color.rgb]U[color.orange]
-220,050,047:M[color.rgb]U[color.red]
-211,054,130:M[color.rgb]U[color.magenta]
-108,113,196:M[color.rgb]U[color.violet]
-038,139,210:M[color.rgb]U[color.blue]
-042,161,152:M[color.rgb]U[color.cyan]
-133,153,000:M[color.rgb]U[color.green]
+@0362b00U[color.base03]
+@0423607U[color.base02]
+@0756e58U[color.base01]
+@0837b65U[color.base00]
+@0969483U[color.base0]
+@0a1a193U[color.base1]
+@0d5e8eeU[color.base2]
+@0e3f6fdU[color.base3]
+@00089b5U[color.yellow]
+@0164bcbU[color.orange]
+@02f32dcU[color.red]
+@08236d3U[color.magenta]
+@0c4716cU[color.violet]
+@0d28b26U[color.blue]
+@098a12aU[color.cyan]
+@0009985U[color.green]
 
 :Q[solarized.light]"< 0U[solarized.light] '
 @[solarized.light]{