diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index ba39026..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Solarized Changelog
-===================
-
-1.0.0beta2
-----------
-
-Changes:
-
-* Modified red from L\*a\*b lightness value 45 to 50 to bring it in line with
- the other accent colors and address bleed into dark background on some
- displays, as well as reducing shift of red against base03 when viewed with
- glasses. All instances of the colorscheme and palettes pdated to new red.
-
-* Changed default OS X color picker palatte swatches to tagged colors (sRGB)
- and included alternate palette with untagged color swatches for advanced
- users.
-
-* Removed default italicized font in terminal mode in the Solarized Vim
- colorscheme (many terminal emulators display Vim italics as reversed type).
- Italics still used in GUI mode by default and can still be turned off in both
- modes by setting a variable: `let g:solarized_italic=0`.
-
-1.0.0beta1
-----------
-
-First public release. Including:
-
-* Adobe Photoshop Swatches
-* Apple Color Picker Palette
-* Gimp Palette
-* iTerm2 colorschemes
-* Mutt mail client colorschemes
-* OS X Terminal.app colors
-* Vim Colorscheme
-* Xresources colors
-
diff --git a/adobe-swatches-solarized/README.md b/adobe-swatches-solarized/README.md
deleted file mode 100644
index 1908589..0000000
--- a/adobe-swatches-solarized/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Solarized - Adobe Photoshop Swatches
-====================================
-
-### [See official homepage for full content](http://ethanschoonover.com/solarized)
-
-Installation
-------------
-
-Import using the Photoshop swatches palette. Colors are referenced below:
-
-The Values
-----------
-
-L\*a\*b values are canonical (White D65, Reference D50), other values are
-matched in sRGB space.
-
- SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B sRGB HSB
- --------- ------- ---- ------- ----------- ---------- ----------- -----------
- base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21
- base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26
- base01 #586e75 10/7 brgreen 240 #4e4e4e 45 -07 -07 88 110 117 194 25 46
- base00 #657b83 11/7 bryellow 241 #585858 50 -07 -07 101 123 131 195 23 51
- base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59
- base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63
- base2 #eee8d5 7/7 white 254 #d7d7af 92 -00 10 238 232 213 44 11 93
- base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99
- yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71
- orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80
- red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86
- magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83
- violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77
- blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82
- cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63
- green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60
diff --git a/adobe-swatches-solarized/solarized.ase b/adobe-swatches-solarized/solarized.ase
deleted file mode 100644
index c903433..0000000
Binary files a/adobe-swatches-solarized/solarized.ase and /dev/null differ
diff --git a/apple-colorpalette-solarized/README.md b/apple-colorpalette-solarized/README.md
deleted file mode 100644
index 1e46117..0000000
--- a/apple-colorpalette-solarized/README.md
+++ /dev/null
@@ -1,81 +0,0 @@
-Solarized - Apple Color Picker Palette
-======================================
-
-### [See official homepage for full content](http://ethanschoonover.com/solarized)
-
-Installation
-------------
-
-Copy or move the `solarized.clr` file to your `~/Library/Colors` directory.
-
-Use the included colorpicker launcher to confirm installation. Launch the
-`launch-colorpicker` application, navigate to the color palette view (usually
-the third icon from the left) and select 'Solarized' from the drop-down palette
-list. Click the cancel button to dismiss the color picker.
-
-Alternate Palette
-------------------
-
-NOT FOR USE UNLESS YOU UNDERSTAND THE HELL THAT IS COLOR MANAGEMENT.
-
-The `alternate palettes` directory contains two Apple Color Picker palettes.
-The "tagged" palette is identical to the main Solarized.clr palette. The
-untagged palette contains untagged sRGB values (Apple calls untagged values
-"device colors"). Don't use this unless you are using an application that
-otherwise can't handle tagged values.
-
-An example: If you are a web developer working on OS X and you wish to use one
-of the Solarized hex values, you have a couple choices:
-
-1. Enter the code manually (easy, you should do this)
-2. Use the color picker (possible, but do it the right way! See below...)
-
-A popular colorpicker plugin is the "Hex Color Picker" from
-. If you wish to use this with the
-colorpicker and a preset palette like Solarized, here's what you do:
-
-1. Instead of the plain old "solarized.clr" palette, use the "solarized-tagged"
- and "solarized-untagged" palettes (solarized-tagged is the same as
- solarized.clr, just renamed for clarity).
-
-2. In the Hex Color picker (inside the Apple Color Picker) click the options
- button and ensure that "Don't generate calibrated colors" is **checked**.
- Ideally, Hex Color Picker would be aware of a particular color being
- untagged (a "device" color in Apple parlance) and hand it over to you in
- unaltered form, even if it was otherwise pulling calibrated colors off your
- display.
-
-3. If you desire a Solarized color **for web use** (not for use in an
- application that uses Mac color swatches) then you switch to the
- Solarized-untagged palette in Color Picker, choose a color, switch to the
- Hex Color Picker tab and grab the correct color. Double check against the
- chart below to confirm it's working as expected.
-
-This is just one of many examples of how, even with applications/plugins that
-deal exclusively with color, there are unexpected or unintuitive exceptions to
-take into account.
-
-The Values
-----------
-
-L\*a\*b values are canonical (White D65, Reference D50), other values are
-matched in sRGB space.
-
- SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B sRGB HSB
- --------- ------- ---- ------- ----------- ---------- ----------- -----------
- base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21
- base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26
- base01 #586e75 10/7 brgreen 240 #4e4e4e 45 -07 -07 88 110 117 194 25 46
- base00 #657b83 11/7 bryellow 241 #585858 50 -07 -07 101 123 131 195 23 51
- base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59
- base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63
- base2 #eee8d5 7/7 white 254 #d7d7af 92 -00 10 238 232 213 44 11 93
- base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99
- yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71
- orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80
- red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86
- magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83
- violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77
- blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82
- cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63
- green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60
diff --git a/apple-colorpalette-solarized/alternate palettes/README.md b/apple-colorpalette-solarized/alternate palettes/README.md
deleted file mode 100644
index 618d0e1..0000000
--- a/apple-colorpalette-solarized/alternate palettes/README.md
+++ /dev/null
@@ -1,66 +0,0 @@
-Alternate Palette
-------------------
-
-NOT FOR USE UNLESS YOU UNDERSTAND THE HELL THAT IS COLOR MANAGEMENT.
-
-The `alternate palettes` directory contains two Apple Color Picker palettes.
-The "tagged" palette is identical to the main Solarized.clr palette. The
-untagged palette contains untagged sRGB values (Apple calls untagged values
-"device colors"). Don't use this unless you are using an application that
-otherwise can't handle tagged values.
-
-An example: If you are a web developer working on OS X and you wish to use one
-of the Solarized hex values, you have a couple choices:
-
-1. Enter the code manually (easy, you should do this)
-2. Use the color picker (possible, but do it the right way! See below...)
-
-A popular colorpicker plugin is the "Hex Color Picker" from
-. If you wish to use this with the
-colorpicker and a preset palette like Solarized, here's what you do:
-
-1. Instead of the plain old "solarized.clr" palette, use the "solarized-tagged"
- and "solarized-untagged" palettes (solarized-tagged is the same as
- solarized.clr, just renamed for clarity).
-
-2. In the Hex Color picker (inside the Apple Color Picker) click the options
- button and ensure that "Don't generate calibrated colors" is **checked**.
- Ideally, Hex Color Picker would be aware of a particular color being
- untagged (a "device" color in Apple parlance) and hand it over to you in
- unaltered form, even if it was otherwise pulling calibrated colors off your
- display.
-
-3. If you desire a Solarized color **for web use** (not for use in an
- application that uses Mac color swatches) then you switch to the
- Solarized-untagged palette in Color Picker, choose a color, switch to the
- Hex Color Picker tab and grab the correct color. Double check against the
- chart below to confirm it's working as expected.
-
-This is just one of many examples of how, even with applications/plugins that
-deal exclusively with color, there are unexpected or unintuitive exceptions to
-take into account.
-
-The Values
-----------
-
-L\*a\*b values are canonical (White D65, Reference D50), other values are
-matched in sRGB space.
-
- SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B sRGB HSB
- --------- ------- ---- ------- ----------- ---------- ----------- -----------
- base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21
- base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26
- base01 #586e75 10/7 brgreen 240 #4e4e4e 45 -07 -07 88 110 117 194 25 46
- base00 #657b83 11/7 bryellow 241 #585858 50 -07 -07 101 123 131 195 23 51
- base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59
- base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63
- base2 #eee8d5 7/7 white 254 #d7d7af 92 -00 10 238 232 213 44 11 93
- base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99
- yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71
- orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80
- red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86
- magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83
- violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77
- blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82
- cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63
- green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60
diff --git a/apple-colorpalette-solarized/alternate palettes/Solarized tagged.clr b/apple-colorpalette-solarized/alternate palettes/Solarized tagged.clr
deleted file mode 100644
index 45d015c..0000000
Binary files a/apple-colorpalette-solarized/alternate palettes/Solarized tagged.clr and /dev/null differ
diff --git a/apple-colorpalette-solarized/alternate palettes/Solarized untagged.clr b/apple-colorpalette-solarized/alternate palettes/Solarized untagged.clr
deleted file mode 100644
index 6b4051c..0000000
Binary files a/apple-colorpalette-solarized/alternate palettes/Solarized untagged.clr and /dev/null differ
diff --git a/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Info.plist b/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Info.plist
deleted file mode 100644
index ef0c8ce..0000000
--- a/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Info.plist
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
- CFBundleAllowMixedLocalizations
-
- CFBundleDevelopmentRegion
- English
- CFBundleExecutable
- applet
- CFBundleIconFile
- applet
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- launch-colorpicker
- CFBundlePackageType
- APPL
- CFBundleSignature
- aplt
- LSMinimumSystemVersionByArchitecture
-
- x86_64
- 10.6
-
- LSRequiresCarbon
-
- WindowState
-
- dividerCollapsed
-
- eventLogLevel
- -1
- name
- ScriptWindowState
- positionOfDivider
- 333
- savedFrame
- 159 537 602 597 0 0 1920 1178
- selectedTabView
- event log
-
-
-
diff --git a/apple-colorpalette-solarized/launch-colorpicker.app/Contents/MacOS/applet b/apple-colorpalette-solarized/launch-colorpicker.app/Contents/MacOS/applet
deleted file mode 100755
index 6a47312..0000000
Binary files a/apple-colorpalette-solarized/launch-colorpicker.app/Contents/MacOS/applet and /dev/null differ
diff --git a/apple-colorpalette-solarized/launch-colorpicker.app/Contents/PkgInfo b/apple-colorpalette-solarized/launch-colorpicker.app/Contents/PkgInfo
deleted file mode 100644
index 3253614..0000000
--- a/apple-colorpalette-solarized/launch-colorpicker.app/Contents/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPLaplt
\ No newline at end of file
diff --git a/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/Scripts/main.scpt b/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/Scripts/main.scpt
deleted file mode 100644
index 396d571..0000000
Binary files a/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/Scripts/main.scpt and /dev/null differ
diff --git a/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/applet.icns b/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/applet.icns
deleted file mode 100644
index fcc1f09..0000000
Binary files a/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/applet.icns and /dev/null differ
diff --git a/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/applet.rsrc b/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/applet.rsrc
deleted file mode 100644
index 30b9f94..0000000
Binary files a/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/applet.rsrc and /dev/null differ
diff --git a/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/description.rtfd/TXT.rtf b/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/description.rtfd/TXT.rtf
deleted file mode 100644
index 33192ea..0000000
--- a/apple-colorpalette-solarized/launch-colorpicker.app/Contents/Resources/description.rtfd/TXT.rtf
+++ /dev/null
@@ -1,4 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
-{\fonttbl}
-{\colortbl;\red255\green255\blue255;}
-}
\ No newline at end of file
diff --git a/apple-colorpalette-solarized/solarized.clr b/apple-colorpalette-solarized/solarized.clr
deleted file mode 100644
index d5b03be..0000000
Binary files a/apple-colorpalette-solarized/solarized.clr and /dev/null differ
diff --git a/emacs-color-theme-solarized/color-theme-solarized.el b/color-theme-solarized.el
similarity index 100%
rename from emacs-color-theme-solarized/color-theme-solarized.el
rename to color-theme-solarized.el
diff --git a/gimp-palette-solarized/README.md b/gimp-palette-solarized/README.md
deleted file mode 100644
index 28e91bd..0000000
--- a/gimp-palette-solarized/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Solarized - Gimp Palette
-========================
-
-### [See official homepage for full content](http://ethanschoonover.com/solarized)
-
-Note that GIMP doesn't tag its color palettes in a colorspace, which is much
-like me giving you a temperature by which to set your thermostat and forgetting
-to tell you if it is Celsius or Fahrenheit. Really, how different could 40
-degrees be between two systems, right?
-
-These are, for what it's worth, sRGB values.
-
-The Values
-----------
-
-L\*a\*b values are canonical (White D65, Reference D50), other values are
-matched in sRGB space.
-
- SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B sRGB HSB
- --------- ------- ---- ------- ----------- ---------- ----------- -----------
- base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21
- base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26
- base01 #586e75 10/7 brgreen 240 #4e4e4e 45 -07 -07 88 110 117 194 25 46
- base00 #657b83 11/7 bryellow 241 #585858 50 -07 -07 101 123 131 195 23 51
- base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59
- base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63
- base2 #eee8d5 7/7 white 254 #d7d7af 92 -00 10 238 232 213 44 11 93
- base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99
- yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71
- orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80
- red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86
- magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83
- violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77
- blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82
- cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63
- green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60
diff --git a/gimp-palette-solarized/solarized.gpl b/gimp-palette-solarized/solarized.gpl
deleted file mode 100644
index 40b86e5..0000000
--- a/gimp-palette-solarized/solarized.gpl
+++ /dev/null
@@ -1,20 +0,0 @@
-GIMP Palette
-Name: Solarized
-Columns: 16
-#
- 0 43 54 solarized-base03
- 7 54 66 solarized-base02
- 88 110 117 solarized-base01
-101 123 131 solarized-base00
-131 148 150 solarized-base0
-147 161 161 solarized-base1
-238 232 213 solarized-base2
-253 246 227 solarized-base3
-181 137 0 solarized-yellow
-203 75 22 solarized-orange
-220 50 47 solarized-red
-211 54 130 solarized-magenta
-108 113 196 solarized-violet
- 38 139 210 solarized-blue
- 42 161 152 solarized-cyan
-133 153 0 solarized-green
diff --git a/img/solarized-165.png b/img/solarized-165.png
deleted file mode 100644
index 8686850..0000000
Binary files a/img/solarized-165.png and /dev/null differ
diff --git a/img/solarized-accentcolors.png b/img/solarized-accentcolors.png
deleted file mode 100644
index 1ea7822..0000000
Binary files a/img/solarized-accentcolors.png and /dev/null differ
diff --git a/img/solarized-dualmode.png b/img/solarized-dualmode.png
deleted file mode 100644
index 74f78f7..0000000
Binary files a/img/solarized-dualmode.png and /dev/null differ
diff --git a/img/solarized-fontsamples-dark.png b/img/solarized-fontsamples-dark.png
deleted file mode 100644
index 8a71c14..0000000
Binary files a/img/solarized-fontsamples-dark.png and /dev/null differ
diff --git a/img/solarized-fontsamples-light.png b/img/solarized-fontsamples-light.png
deleted file mode 100644
index f58fc62..0000000
Binary files a/img/solarized-fontsamples-light.png and /dev/null differ
diff --git a/img/solarized-monotones.png b/img/solarized-monotones.png
deleted file mode 100644
index e02bf53..0000000
Binary files a/img/solarized-monotones.png and /dev/null differ
diff --git a/img/solarized-palette.png b/img/solarized-palette.png
deleted file mode 100644
index f731469..0000000
Binary files a/img/solarized-palette.png and /dev/null differ
diff --git a/img/solarized-screen-c-dark-th.png b/img/solarized-screen-c-dark-th.png
deleted file mode 100644
index 057446b..0000000
Binary files a/img/solarized-screen-c-dark-th.png and /dev/null differ
diff --git a/img/solarized-screen-c-dark.png b/img/solarized-screen-c-dark.png
deleted file mode 100644
index 86c0bcb..0000000
Binary files a/img/solarized-screen-c-dark.png and /dev/null differ
diff --git a/img/solarized-screen-c-light-th.png b/img/solarized-screen-c-light-th.png
deleted file mode 100644
index 31a1426..0000000
Binary files a/img/solarized-screen-c-light-th.png and /dev/null differ
diff --git a/img/solarized-screen-c-light.png b/img/solarized-screen-c-light.png
deleted file mode 100644
index f7c8da8..0000000
Binary files a/img/solarized-screen-c-light.png and /dev/null differ
diff --git a/img/solarized-screen-haskell-dark-th.png b/img/solarized-screen-haskell-dark-th.png
deleted file mode 100644
index 8b55f90..0000000
Binary files a/img/solarized-screen-haskell-dark-th.png and /dev/null differ
diff --git a/img/solarized-screen-haskell-dark.png b/img/solarized-screen-haskell-dark.png
deleted file mode 100644
index 2979ab6..0000000
Binary files a/img/solarized-screen-haskell-dark.png and /dev/null differ
diff --git a/img/solarized-screen-haskell-light-th.png b/img/solarized-screen-haskell-light-th.png
deleted file mode 100644
index bfa7cd3..0000000
Binary files a/img/solarized-screen-haskell-light-th.png and /dev/null differ
diff --git a/img/solarized-screen-haskell-light.png b/img/solarized-screen-haskell-light.png
deleted file mode 100644
index 3f95fc9..0000000
Binary files a/img/solarized-screen-haskell-light.png and /dev/null differ
diff --git a/img/solarized-screen-html-dark-th.png b/img/solarized-screen-html-dark-th.png
deleted file mode 100644
index aff92ed..0000000
Binary files a/img/solarized-screen-html-dark-th.png and /dev/null differ
diff --git a/img/solarized-screen-html-dark.png b/img/solarized-screen-html-dark.png
deleted file mode 100644
index 23ee02e..0000000
Binary files a/img/solarized-screen-html-dark.png and /dev/null differ
diff --git a/img/solarized-screen-html-light-th.png b/img/solarized-screen-html-light-th.png
deleted file mode 100644
index 5a11d7f..0000000
Binary files a/img/solarized-screen-html-light-th.png and /dev/null differ
diff --git a/img/solarized-screen-html-light.png b/img/solarized-screen-html-light.png
deleted file mode 100644
index bb9a19d..0000000
Binary files a/img/solarized-screen-html-light.png and /dev/null differ
diff --git a/img/solarized-screen-java-dark-th.png b/img/solarized-screen-java-dark-th.png
deleted file mode 100644
index 8ea07b5..0000000
Binary files a/img/solarized-screen-java-dark-th.png and /dev/null differ
diff --git a/img/solarized-screen-java-dark.png b/img/solarized-screen-java-dark.png
deleted file mode 100644
index 38856c8..0000000
Binary files a/img/solarized-screen-java-dark.png and /dev/null differ
diff --git a/img/solarized-screen-java-light-th.png b/img/solarized-screen-java-light-th.png
deleted file mode 100644
index 7044c4d..0000000
Binary files a/img/solarized-screen-java-light-th.png and /dev/null differ
diff --git a/img/solarized-screen-java-light.png b/img/solarized-screen-java-light.png
deleted file mode 100644
index 28af3b9..0000000
Binary files a/img/solarized-screen-java-light.png and /dev/null differ
diff --git a/img/solarized-screen-mutt-dark-th.png b/img/solarized-screen-mutt-dark-th.png
deleted file mode 100644
index 2f000c5..0000000
Binary files a/img/solarized-screen-mutt-dark-th.png and /dev/null differ
diff --git a/img/solarized-screen-mutt-dark.png b/img/solarized-screen-mutt-dark.png
deleted file mode 100644
index f5985f5..0000000
Binary files a/img/solarized-screen-mutt-dark.png and /dev/null differ
diff --git a/img/solarized-screen-mutt-light-th.png b/img/solarized-screen-mutt-light-th.png
deleted file mode 100644
index ea2981b..0000000
Binary files a/img/solarized-screen-mutt-light-th.png and /dev/null differ
diff --git a/img/solarized-screen-mutt-light.png b/img/solarized-screen-mutt-light.png
deleted file mode 100644
index 24347e2..0000000
Binary files a/img/solarized-screen-mutt-light.png and /dev/null differ
diff --git a/img/solarized-screen-pandoc-dark-th.png b/img/solarized-screen-pandoc-dark-th.png
deleted file mode 100644
index 5dc9be3..0000000
Binary files a/img/solarized-screen-pandoc-dark-th.png and /dev/null differ
diff --git a/img/solarized-screen-pandoc-dark.png b/img/solarized-screen-pandoc-dark.png
deleted file mode 100644
index b150e66..0000000
Binary files a/img/solarized-screen-pandoc-dark.png and /dev/null differ
diff --git a/img/solarized-screen-pandoc-light-th.png b/img/solarized-screen-pandoc-light-th.png
deleted file mode 100644
index 49e6199..0000000
Binary files a/img/solarized-screen-pandoc-light-th.png and /dev/null differ
diff --git a/img/solarized-screen-pandoc-light.png b/img/solarized-screen-pandoc-light.png
deleted file mode 100644
index 581c59b..0000000
Binary files a/img/solarized-screen-pandoc-light.png and /dev/null differ
diff --git a/img/solarized-screen-perl-dark-th.png b/img/solarized-screen-perl-dark-th.png
deleted file mode 100644
index ecd9d89..0000000
Binary files a/img/solarized-screen-perl-dark-th.png and /dev/null differ
diff --git a/img/solarized-screen-perl-dark.png b/img/solarized-screen-perl-dark.png
deleted file mode 100644
index efb1f94..0000000
Binary files a/img/solarized-screen-perl-dark.png and /dev/null differ
diff --git a/img/solarized-screen-perl-light-th.png b/img/solarized-screen-perl-light-th.png
deleted file mode 100644
index 16a768b..0000000
Binary files a/img/solarized-screen-perl-light-th.png and /dev/null differ
diff --git a/img/solarized-screen-perl-light.png b/img/solarized-screen-perl-light.png
deleted file mode 100644
index 01e5ee3..0000000
Binary files a/img/solarized-screen-perl-light.png and /dev/null differ
diff --git a/img/solarized-screen-python-dark-th.png b/img/solarized-screen-python-dark-th.png
deleted file mode 100644
index c51c704..0000000
Binary files a/img/solarized-screen-python-dark-th.png and /dev/null differ
diff --git a/img/solarized-screen-python-dark.png b/img/solarized-screen-python-dark.png
deleted file mode 100644
index b8f96c2..0000000
Binary files a/img/solarized-screen-python-dark.png and /dev/null differ
diff --git a/img/solarized-screen-python-light-th.png b/img/solarized-screen-python-light-th.png
deleted file mode 100644
index 31239c9..0000000
Binary files a/img/solarized-screen-python-light-th.png and /dev/null differ
diff --git a/img/solarized-screen-python-light.png b/img/solarized-screen-python-light.png
deleted file mode 100644
index 013ec34..0000000
Binary files a/img/solarized-screen-python-light.png and /dev/null differ
diff --git a/img/solarized-screen-ruby-dark-th.png b/img/solarized-screen-ruby-dark-th.png
deleted file mode 100644
index c0ad648..0000000
Binary files a/img/solarized-screen-ruby-dark-th.png and /dev/null differ
diff --git a/img/solarized-screen-ruby-dark.png b/img/solarized-screen-ruby-dark.png
deleted file mode 100644
index f7d44b1..0000000
Binary files a/img/solarized-screen-ruby-dark.png and /dev/null differ
diff --git a/img/solarized-screen-ruby-light-th.png b/img/solarized-screen-ruby-light-th.png
deleted file mode 100644
index ce4f794..0000000
Binary files a/img/solarized-screen-ruby-light-th.png and /dev/null differ
diff --git a/img/solarized-screen-ruby-light.png b/img/solarized-screen-ruby-light.png
deleted file mode 100644
index 0b884d4..0000000
Binary files a/img/solarized-screen-ruby-light.png and /dev/null differ
diff --git a/img/solarized-screen-tex-dark-th.png b/img/solarized-screen-tex-dark-th.png
deleted file mode 100644
index 759d00f..0000000
Binary files a/img/solarized-screen-tex-dark-th.png and /dev/null differ
diff --git a/img/solarized-screen-tex-dark.png b/img/solarized-screen-tex-dark.png
deleted file mode 100644
index a780607..0000000
Binary files a/img/solarized-screen-tex-dark.png and /dev/null differ
diff --git a/img/solarized-screen-tex-light-th.png b/img/solarized-screen-tex-light-th.png
deleted file mode 100644
index dbc2e72..0000000
Binary files a/img/solarized-screen-tex-light-th.png and /dev/null differ
diff --git a/img/solarized-screen-tex-light.png b/img/solarized-screen-tex-light.png
deleted file mode 100644
index 50acd70..0000000
Binary files a/img/solarized-screen-tex-light.png and /dev/null differ
diff --git a/img/solarized-selcon.png b/img/solarized-selcon.png
deleted file mode 100644
index 8a15081..0000000
Binary files a/img/solarized-selcon.png and /dev/null differ
diff --git a/img/solarized-sym.png b/img/solarized-sym.png
deleted file mode 100644
index e54a7e2..0000000
Binary files a/img/solarized-sym.png and /dev/null differ
diff --git a/img/solarized-yinyang.png b/img/solarized-yinyang.png
deleted file mode 100644
index 8dc5cba..0000000
Binary files a/img/solarized-yinyang.png and /dev/null differ
diff --git a/iterm2-colors-solarized/README.md b/iterm2-colors-solarized/README.md
deleted file mode 100644
index fb3010b..0000000
--- a/iterm2-colors-solarized/README.md
+++ /dev/null
@@ -1,63 +0,0 @@
-Solarized - iTerm2 Color Presets
-================================
-
-### [See official homepage for full content](http://ethanschoonover.com/solarized)
-
-Installation
-------------
-
-Download current build of iTerm 2 from:
-
-NOTE: Only builds 480 (Jan 11 2011) and later support import of color schemes.
-If the stable release doesn't include this function, grab the nightly build
-from:
-
-Open iTerm 2, open Preferences, click on the "Profiles" (formerly Addresses,
-formerly Bookmarks) icon in the preferences toolbar, then select the "colors"
-tab. Click on the "load presets" and select "import...". Select the Solaris
-Light or Dark theme file.
-
-You have now loaded the Solarized color presets into iTerm 2, but haven't yet
-applied them. To apply them, simply select an existing profile from the profile
-list window on the left, or create a new profile. Then select the Solarized
-Dark or Solarized Light preset from the "Load Presets" drop down.
-
-Ok, I've gone crazy with iTerm2 color management but you are going to be ok.
-Just realize two things:
-
-1. Like other apps (Chrome as of this writing) on the Mac, iTerm2 locks in
- a target color space when you create a new window. If you switch your
- monitor color space, relaunch iTerm2 and it will pick up the new target
- color space.
-
-2. The colors in iTerm2 currently cannot be device colors. They are baked in as
- generic rgb (which, despite the name, is an actual, specific color space
- from Apple and is used as a default just like other systems use sRGB as
- a default). I've switch Solarized Apple Color Picker palettes to use tagged
- colors by default, so for the most part iTerm2 will match up with other apps
- where you use Color Picker swatches.
-
-The Values
-----------
-
-L\*a\*b values are canonical (White D65, Reference D50), other values are
-matched in sRGB space.
-
- SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB
- --------- ------- ---- ------- ----------- ---------- ----------- -----------
- base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21
- base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26
- base01 #586e75 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46
- base00 #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51
- base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59
- base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63
- base2 #eee8d5 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93
- base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99
- yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71
- orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80
- red #d30102 1/1 red 124 #af0000 45 70 60 211 1 2 0 99 83
- magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83
- violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77
- blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82
- cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63
- green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60
diff --git a/iterm2-colors-solarized/Solarized Dark.itermcolors b/iterm2-colors-solarized/Solarized Dark.itermcolors
deleted file mode 100644
index ed31a4a..0000000
--- a/iterm2-colors-solarized/Solarized Dark.itermcolors
+++ /dev/null
@@ -1,213 +0,0 @@
-
-
-
-
- Ansi 0 Color
-
- Blue Component
- 0.19370138645172119
- Green Component
- 0.15575926005840302
- Red Component
- 0.0
-
- Ansi 1 Color
-
- Blue Component
- 0.14145714044570923
- Green Component
- 0.10840655118227005
- Red Component
- 0.81926977634429932
-
- Ansi 10 Color
-
- Blue Component
- 0.38298487663269043
- Green Component
- 0.35665956139564514
- Red Component
- 0.27671992778778076
-
- Ansi 11 Color
-
- Blue Component
- 0.43850564956665039
- Green Component
- 0.40717673301696777
- Red Component
- 0.32436618208885193
-
- Ansi 12 Color
-
- Blue Component
- 0.51685798168182373
- Green Component
- 0.50962930917739868
- Red Component
- 0.44058024883270264
-
- Ansi 13 Color
-
- Blue Component
- 0.72908437252044678
- Green Component
- 0.33896297216415405
- Red Component
- 0.34798634052276611
-
- Ansi 14 Color
-
- Blue Component
- 0.56363654136657715
- Green Component
- 0.56485837697982788
- Red Component
- 0.50599193572998047
-
- Ansi 15 Color
-
- Blue Component
- 0.86405980587005615
- Green Component
- 0.95794391632080078
- Red Component
- 0.98943418264389038
-
- Ansi 2 Color
-
- Blue Component
- 0.020208755508065224
- Green Component
- 0.54115492105484009
- Red Component
- 0.44977453351020813
-
- Ansi 3 Color
-
- Blue Component
- 0.023484811186790466
- Green Component
- 0.46751424670219421
- Red Component
- 0.64746475219726562
-
- Ansi 4 Color
-
- Blue Component
- 0.78231418132781982
- Green Component
- 0.46265947818756104
- Red Component
- 0.12754884362220764
-
- Ansi 5 Color
-
- Blue Component
- 0.43516635894775391
- Green Component
- 0.10802463442087173
- Red Component
- 0.77738940715789795
-
- Ansi 6 Color
-
- Blue Component
- 0.52502274513244629
- Green Component
- 0.57082360982894897
- Red Component
- 0.14679534733295441
-
- Ansi 7 Color
-
- Blue Component
- 0.79781103134155273
- Green Component
- 0.89001238346099854
- Red Component
- 0.91611063480377197
-
- Ansi 8 Color
-
- Blue Component
- 0.15170273184776306
- Green Component
- 0.11783610284328461
- Red Component
- 0.0
-
- Ansi 9 Color
-
- Blue Component
- 0.073530435562133789
- Green Component
- 0.21325300633907318
- Red Component
- 0.74176257848739624
-
- Background Color
-
- Blue Component
- 0.15170273184776306
- Green Component
- 0.11783610284328461
- Red Component
- 0.0
-
- Bold Color
-
- Blue Component
- 0.56363654136657715
- Green Component
- 0.56485837697982788
- Red Component
- 0.50599193572998047
-
- Cursor Color
-
- Blue Component
- 0.51685798168182373
- Green Component
- 0.50962930917739868
- Red Component
- 0.44058024883270264
-
- Cursor Text Color
-
- Blue Component
- 0.19370138645172119
- Green Component
- 0.15575926005840302
- Red Component
- 0.0
-
- Foreground Color
-
- Blue Component
- 0.51685798168182373
- Green Component
- 0.50962930917739868
- Red Component
- 0.44058024883270264
-
- Selected Text Color
-
- Blue Component
- 0.56363654136657715
- Green Component
- 0.56485837697982788
- Red Component
- 0.50599193572998047
-
- Selection Color
-
- Blue Component
- 0.19370138645172119
- Green Component
- 0.15575926005840302
- Red Component
- 0.0
-
-
-
diff --git a/iterm2-colors-solarized/Solarized Light.itermcolors b/iterm2-colors-solarized/Solarized Light.itermcolors
deleted file mode 100644
index 9918963..0000000
--- a/iterm2-colors-solarized/Solarized Light.itermcolors
+++ /dev/null
@@ -1,213 +0,0 @@
-
-
-
-
- Ansi 0 Color
-
- Blue Component
- 0.19370138645172119
- Green Component
- 0.15575926005840302
- Red Component
- 0.0
-
- Ansi 1 Color
-
- Blue Component
- 0.14145712554454803
- Green Component
- 0.10840645432472229
- Red Component
- 0.81926983594894409
-
- Ansi 10 Color
-
- Blue Component
- 0.38298487663269043
- Green Component
- 0.35665956139564514
- Red Component
- 0.27671992778778076
-
- Ansi 11 Color
-
- Blue Component
- 0.43850564956665039
- Green Component
- 0.40717673301696777
- Red Component
- 0.32436618208885193
-
- Ansi 12 Color
-
- Blue Component
- 0.51685798168182373
- Green Component
- 0.50962930917739868
- Red Component
- 0.44058024883270264
-
- Ansi 13 Color
-
- Blue Component
- 0.72908437252044678
- Green Component
- 0.33896297216415405
- Red Component
- 0.34798634052276611
-
- Ansi 14 Color
-
- Blue Component
- 0.56363654136657715
- Green Component
- 0.56485837697982788
- Red Component
- 0.50599193572998047
-
- Ansi 15 Color
-
- Blue Component
- 0.86405980587005615
- Green Component
- 0.95794391632080078
- Red Component
- 0.98943418264389038
-
- Ansi 2 Color
-
- Blue Component
- 0.020208755508065224
- Green Component
- 0.54115492105484009
- Red Component
- 0.44977453351020813
-
- Ansi 3 Color
-
- Blue Component
- 0.023484811186790466
- Green Component
- 0.46751424670219421
- Red Component
- 0.64746475219726562
-
- Ansi 4 Color
-
- Blue Component
- 0.78231418132781982
- Green Component
- 0.46265947818756104
- Red Component
- 0.12754884362220764
-
- Ansi 5 Color
-
- Blue Component
- 0.43516635894775391
- Green Component
- 0.10802463442087173
- Red Component
- 0.77738940715789795
-
- Ansi 6 Color
-
- Blue Component
- 0.52502274513244629
- Green Component
- 0.57082360982894897
- Red Component
- 0.14679534733295441
-
- Ansi 7 Color
-
- Blue Component
- 0.79781103134155273
- Green Component
- 0.89001238346099854
- Red Component
- 0.91611063480377197
-
- Ansi 8 Color
-
- Blue Component
- 0.15170273184776306
- Green Component
- 0.11783610284328461
- Red Component
- 0.0
-
- Ansi 9 Color
-
- Blue Component
- 0.073530435562133789
- Green Component
- 0.21325300633907318
- Red Component
- 0.74176257848739624
-
- Background Color
-
- Blue Component
- 0.86405980587005615
- Green Component
- 0.95794391632080078
- Red Component
- 0.98943418264389038
-
- Bold Color
-
- Blue Component
- 0.38298487663269043
- Green Component
- 0.35665956139564514
- Red Component
- 0.27671992778778076
-
- Cursor Color
-
- Blue Component
- 0.43850564956665039
- Green Component
- 0.40717673301696777
- Red Component
- 0.32436618208885193
-
- Cursor Text Color
-
- Blue Component
- 0.79781103134155273
- Green Component
- 0.89001238346099854
- Red Component
- 0.91611063480377197
-
- Foreground Color
-
- Blue Component
- 0.43850564956665039
- Green Component
- 0.40717673301696777
- Red Component
- 0.32436618208885193
-
- Selected Text Color
-
- Blue Component
- 0.38298487663269043
- Green Component
- 0.35665956139564514
- Red Component
- 0.27671992778778076
-
- Selection Color
-
- Blue Component
- 0.79781103134155273
- Green Component
- 0.89001238346099854
- Red Component
- 0.91611063480377197
-
-
-
diff --git a/mutt-colors-solarized/README.md b/mutt-colors-solarized/README.md
deleted file mode 100644
index d1062ea..0000000
--- a/mutt-colors-solarized/README.md
+++ /dev/null
@@ -1,101 +0,0 @@
-Solarized Colorscheme for Mutt
-==============================
-
-Developed by Ethan Schoonover
-
-See the [homepage for the Solarized colorscheme][solarized] for versions for
-Vim, popular terminal emulators and other applications.
-
-If you have come across this colorscheme via the [mutt-only repository on
-github][mutt-solarized-github], see the link above to the Solarized homepage or
-visit the [github repository for Solarized][solarized-github].
-
-[solarized]: http://ethanschoonover.com/solarized
-[solarized-github]: https://github.com/altercation/solarized
-[mutt-solarized-github]: https://github.com/altercation/mutt-colors-solarized
-
-Installation
-------------
-
-1. Move the mutt-colors-solarized directory into the same location as your
- muttrc. Alternately, you can copy just the version of the colorscheme you
- will be using (see below for details).
-
-2. Source the colorscheme in your muttrc. Only one of the following, depending
- on the light or dark background you wish to use, and whether you want to use
- the native 16 colors of your terminal emulator or the approximatation
- provided by the 256 color values. See note below for recommendations.
-
- source $MAILCONF/mutt-colors-solarized/mutt-colors-solarized-dark-16.muttrc
- source $MAILCONF/mutt-colors-solarized/mutt-colors-solarized-light-16.muttrc
- source $MAILCONF/mutt-colors-solarized/mutt-colors-solarized-dark-256.muttrc
- source $MAILCONF/mutt-colors-solarized/mutt-colors-solarized-light-256.muttrc
-
-Note: You can safely ignore the compile colors script and the template file.
-They are used only for creating the actual colorscheme files. If you want to
-modify the colorscheme or colors, you can use the compile script and template
-to do so.
-
-Which Variation?
-----------------
-
-See the [Solarized homepage][solarized] for screenshots which will help you
-select either the light or dark background.
-
-A thornier question is whether to use the 16 color version or the 256 color
-version. I have spent a great deal of time refining this colorscheme and for
-the most accurate experience I recommend that you set your terminal emulator to
-use the Solarized colorvalues with the 16 color mutt colorschemes in this
-distribution. Terminal colorschemes/values are available at the homepage linked
-to above.
-
-The 256 color versions provide an approximate experience of the colorscheme in
-most regards, though the carefully selected monotones are crudely replaced by
-neutral tones.
-
-The Values
-----------
-
-L\*a\*b values are canonical (White D65, Reference D50), other values are
-matched in sRGB space.
-
- SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B sRGB HSB
- --------- ------- ---- ------- ----------- ---------- ----------- -----------
- base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21
- base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26
- base01 #586e75 10/7 brgreen 240 #4e4e4e 45 -07 -07 88 110 117 194 25 46
- base00 #657b83 11/7 bryellow 241 #585858 50 -07 -07 101 123 131 195 23 51
- base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59
- base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63
- base2 #eee8d5 7/7 white 254 #d7d7af 92 -00 10 238 232 213 44 11 93
- base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99
- yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71
- orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80
- red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86
- magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83
- violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77
- blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82
- cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63
- green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60
-
-License
--------
-Copyright (c) 2011 Ethan Schoonover
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/mutt-colors-solarized/mutt-colors-solarized-dark-16.muttrc b/mutt-colors-solarized/mutt-colors-solarized-dark-16.muttrc
deleted file mode 100644
index e9d6def..0000000
--- a/mutt-colors-solarized/mutt-colors-solarized-dark-16.muttrc
+++ /dev/null
@@ -1,151 +0,0 @@
-# vim: filetype=muttrc
-
-#
-#
-# make sure that you are using mutt linked against slang, not ncurses, or
-# suffer the consequences of weird color issues. use "mutt -v" to check this.
-
-# custom body highlights -----------------------------------------------
-# highlight my name and other personally relevant strings
-#color body yellow default "(ethan|schoonover)"
-# custom index highlights ----------------------------------------------
-# messages which mention my name in the body
-#color index yellow default "~b \"phil(_g|\!| gregory| gold)|pgregory\" !~N !~T !~F !~p !~P"
-#color index J_cream brightwhite "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~N !~T !~F !~p !~P"
-#color index yellow cyan "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~T !~F !~p !~P"
-#color index yellow J_magent "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~F !~p !~P"
-## messages which are in reference to my mails
-#color index J_magent default "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" !~N !~T !~F !~p !~P"
-#color index J_magent brightwhite "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~N !~T !~F !~p !~P"
-#color index J_magent cyan "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~T !~F !~p !~P"
-#color index J_magent red "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P"
-
-# for background in 16 color terminal, valid background colors include:
-# base03, bg, black, any of the non brights
-
-# basic colors ---------------------------------------------------------
-color normal brightyellow default
-color error red default
-color tilde black default
-color message cyan default
-color markers red white
-color attachment white default
-color search brightmagenta default
-#color status J_black J_status
-color status brightyellow black
-color indicator brightblack yellow
-color tree yellow default # arrow in threads
-
-# basic monocolor screen
-mono bold bold
-mono underline underline
-mono indicator reverse
-mono error bold
-
-# index ----------------------------------------------------------------
-
-#color index red default "~D(!~p|~p)" # deleted
-#color index black default ~F # flagged
-#color index brightred default ~= # duplicate messages
-#color index brightgreen default "~A!~N!~T!~p!~Q!~F!~D!~P" # the rest
-#color index J_base default "~A~N!~T!~p!~Q!~F!~D" # the rest, new
-color index red default "~A" # all messages
-color index brightred default "~E" # expired messages
-color index blue default "~N" # new messages
-color index blue default "~O" # old messages
-color index brightmagenta default "~Q" # messages that have been replied to
-color index brightgreen default "~R" # read messages
-color index blue default "~U" # unread messages
-color index blue default "~U~$" # unread, unreferenced messages
-color index brightyellow default "~v" # messages part of a collapsed thread
-color index brightyellow default "~P" # messages from me
-color index cyan default "~p!~F" # messages to me
-color index cyan default "~N~p!~F" # new messages to me
-color index cyan default "~U~p!~F" # unread messages to me
-color index brightgreen default "~R~p!~F" # messages to me
-color index red default "~F" # flagged messages
-color index red default "~F~p" # flagged messages to me
-color index red default "~N~F" # new flagged messages
-color index red default "~N~F~p" # new flagged messages to me
-color index red default "~U~F~p" # new flagged messages to me
-color index black red "~D" # deleted messages
-color index brightcyan default "~v~(!~N)" # collapsed thread with no unread
-color index yellow default "~v~(~N)" # collapsed thread with some unread
-color index green default "~N~v~(~N)" # collapsed thread with unread parent
-# statusbg used to indicated flagged when foreground color shows other status
-# for collapsed thread
-color index red black "~v~(~F)!~N" # collapsed thread with flagged, no unread
-color index yellow black "~v~(~F~N)" # collapsed thread with some unread & flagged
-color index green black "~N~v~(~F~N)" # collapsed thread with unread parent & flagged
-color index green black "~N~v~(~F)" # collapsed thread with unread parent, no unread inside, but some flagged
-color index cyan black "~v~(~p)" # collapsed thread with unread parent, no unread inside, some to me directly
-color index yellow red "~v~(~D)" # thread with deleted (doesn't differentiate between all or partial)
-#color index yellow default "~(~N)" # messages in threads with some unread
-#color index green default "~S" # superseded messages
-#color index red default "~T" # tagged messages
-#color index brightred red "~=" # duplicated messages
-
-# message headers ------------------------------------------------------
-
-#color header brightgreen default "^"
-color hdrdefault brightgreen default
-color header brightyellow default "^(From)"
-color header blue default "^(Subject)"
-
-# body -----------------------------------------------------------------
-
-color quoted blue default
-color quoted1 cyan default
-color quoted2 yellow default
-color quoted3 red default
-color quoted4 brightred default
-
-color signature brightgreen default
-color bold black default
-color underline black default
-color normal default default
-#
-color body brightcyan default "[;:][-o][)/(|]" # emoticons
-color body brightcyan default "[;:][)(|]" # emoticons
-color body brightcyan default "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\
- |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\
- |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?"
-color body brightcyan default "[ ][*][^*]*[*][ ]?" # more emoticon?
-color body brightcyan default "[ ]?[*][^*]*[*][ ]" # more emoticon?
-
-## pgp
-
-color body red default "(BAD signature)"
-color body cyan default "(Good signature)"
-color body brightblack default "^gpg: Good signature .*"
-color body brightyellow default "^gpg: "
-color body brightyellow red "^gpg: BAD signature from.*"
-mono body bold "^gpg: Good signature"
-mono body bold "^gpg: BAD signature from.*"
-
-# yes, an insance URL regex
-color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
-# and a heavy handed email regex
-#color body J_magent default "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])"
-
-# Various smilies and the like
-#color body brightwhite default "<[Gg]>" #
-#color body brightwhite default "<[Bb][Gg]>" #
-#color body yellow default " [;:]-*[})>{(<|]" # :-) etc...
-# *bold*
-#color body blue default "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-#mono body bold "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-# _underline_
-#color body blue default "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-#mono body underline "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-# /italic/ (Sometimes gets directory names)
-#color body blue default "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-#mono body underline "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-
-# Border lines.
-#color body blue default "( *[-+=#*~_]){6,}"
-
-#folder-hook . "color status J_black J_status "
-#folder-hook gmail/inbox "color status J_black yellow "
-#folder-hook gmail/important "color status J_black yellow "
-
diff --git a/mutt-colors-solarized/mutt-colors-solarized-dark-256.muttrc b/mutt-colors-solarized/mutt-colors-solarized-dark-256.muttrc
deleted file mode 100644
index b318651..0000000
--- a/mutt-colors-solarized/mutt-colors-solarized-dark-256.muttrc
+++ /dev/null
@@ -1,151 +0,0 @@
-# vim: filetype=muttrc
-
-#
-#
-# make sure that you are using mutt linked against slang, not ncurses, or
-# suffer the consequences of weird color issues. use "mutt -v" to check this.
-
-# custom body highlights -----------------------------------------------
-# highlight my name and other personally relevant strings
-#color body color136 color234 "(ethan|schoonover)"
-# custom index highlights ----------------------------------------------
-# messages which mention my name in the body
-#color index color136 color234 "~b \"phil(_g|\!| gregory| gold)|pgregory\" !~N !~T !~F !~p !~P"
-#color index J_cream color230 "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~N !~T !~F !~p !~P"
-#color index color136 color37 "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~T !~F !~p !~P"
-#color index color136 J_magent "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~F !~p !~P"
-## messages which are in reference to my mails
-#color index J_magent color234 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" !~N !~T !~F !~p !~P"
-#color index J_magent color230 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~N !~T !~F !~p !~P"
-#color index J_magent color37 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~T !~F !~p !~P"
-#color index J_magent color160 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P"
-
-# for background in 16 color terminal, valid background colors include:
-# base03, bg, black, any of the non brights
-
-# basic colors ---------------------------------------------------------
-color normal color241 color234
-color error color160 color234
-color tilde color235 color234
-color message color37 color234
-color markers color160 color254
-color attachment color254 color234
-color search color61 color234
-#color status J_black J_status
-color status color241 color235
-color indicator color234 color136
-color tree color136 color234 # arrow in threads
-
-# basic monocolor screen
-mono bold bold
-mono underline underline
-mono indicator reverse
-mono error bold
-
-# index ----------------------------------------------------------------
-
-#color index color160 color234 "~D(!~p|~p)" # deleted
-#color index color235 color234 ~F # flagged
-#color index color166 color234 ~= # duplicate messages
-#color index color240 color234 "~A!~N!~T!~p!~Q!~F!~D!~P" # the rest
-#color index J_base color234 "~A~N!~T!~p!~Q!~F!~D" # the rest, new
-color index color160 color234 "~A" # all messages
-color index color166 color234 "~E" # expired messages
-color index color33 color234 "~N" # new messages
-color index color33 color234 "~O" # old messages
-color index color61 color234 "~Q" # messages that have been replied to
-color index color240 color234 "~R" # read messages
-color index color33 color234 "~U" # unread messages
-color index color33 color234 "~U~$" # unread, unreferenced messages
-color index color241 color234 "~v" # messages part of a collapsed thread
-color index color241 color234 "~P" # messages from me
-color index color37 color234 "~p!~F" # messages to me
-color index color37 color234 "~N~p!~F" # new messages to me
-color index color37 color234 "~U~p!~F" # unread messages to me
-color index color240 color234 "~R~p!~F" # messages to me
-color index color160 color234 "~F" # flagged messages
-color index color160 color234 "~F~p" # flagged messages to me
-color index color160 color234 "~N~F" # new flagged messages
-color index color160 color234 "~N~F~p" # new flagged messages to me
-color index color160 color234 "~U~F~p" # new flagged messages to me
-color index color235 color160 "~D" # deleted messages
-color index color245 color234 "~v~(!~N)" # collapsed thread with no unread
-color index color136 color234 "~v~(~N)" # collapsed thread with some unread
-color index color64 color234 "~N~v~(~N)" # collapsed thread with unread parent
-# statusbg used to indicated flagged when foreground color shows other status
-# for collapsed thread
-color index color160 color235 "~v~(~F)!~N" # collapsed thread with flagged, no unread
-color index color136 color235 "~v~(~F~N)" # collapsed thread with some unread & flagged
-color index color64 color235 "~N~v~(~F~N)" # collapsed thread with unread parent & flagged
-color index color64 color235 "~N~v~(~F)" # collapsed thread with unread parent, no unread inside, but some flagged
-color index color37 color235 "~v~(~p)" # collapsed thread with unread parent, no unread inside, some to me directly
-color index color136 color160 "~v~(~D)" # thread with deleted (doesn't differentiate between all or partial)
-#color index color136 color234 "~(~N)" # messages in threads with some unread
-#color index color64 color234 "~S" # superseded messages
-#color index color160 color234 "~T" # tagged messages
-#color index color166 color160 "~=" # duplicated messages
-
-# message headers ------------------------------------------------------
-
-#color header color240 color234 "^"
-color hdrdefault color240 color234
-color header color241 color234 "^(From)"
-color header color33 color234 "^(Subject)"
-
-# body -----------------------------------------------------------------
-
-color quoted color33 color234
-color quoted1 color37 color234
-color quoted2 color136 color234
-color quoted3 color160 color234
-color quoted4 color166 color234
-
-color signature color240 color234
-color bold color235 color234
-color underline color235 color234
-color normal color244 color234
-#
-color body color245 color234 "[;:][-o][)/(|]" # emoticons
-color body color245 color234 "[;:][)(|]" # emoticons
-color body color245 color234 "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\
- |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\
- |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?"
-color body color245 color234 "[ ][*][^*]*[*][ ]?" # more emoticon?
-color body color245 color234 "[ ]?[*][^*]*[*][ ]" # more emoticon?
-
-## pgp
-
-color body color160 color234 "(BAD signature)"
-color body color37 color234 "(Good signature)"
-color body color234 color234 "^gpg: Good signature .*"
-color body color241 color234 "^gpg: "
-color body color241 color160 "^gpg: BAD signature from.*"
-mono body bold "^gpg: Good signature"
-mono body bold "^gpg: BAD signature from.*"
-
-# yes, an insance URL regex
-color body color160 color234 "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
-# and a heavy handed email regex
-#color body J_magent color234 "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])"
-
-# Various smilies and the like
-#color body color230 color234 "<[Gg]>" #
-#color body color230 color234 "<[Bb][Gg]>" #
-#color body color136 color234 " [;:]-*[})>{(<|]" # :-) etc...
-# *bold*
-#color body color33 color234 "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-#mono body bold "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-# _underline_
-#color body color33 color234 "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-#mono body underline "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-# /italic/ (Sometimes gets directory names)
-#color body color33 color234 "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-#mono body underline "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-
-# Border lines.
-#color body color33 color234 "( *[-+=#*~_]){6,}"
-
-#folder-hook . "color status J_black J_status "
-#folder-hook gmail/inbox "color status J_black color136 "
-#folder-hook gmail/important "color status J_black color136 "
-
diff --git a/mutt-colors-solarized/mutt-colors-solarized-light-16.muttrc b/mutt-colors-solarized/mutt-colors-solarized-light-16.muttrc
deleted file mode 100644
index 3c119fb..0000000
--- a/mutt-colors-solarized/mutt-colors-solarized-light-16.muttrc
+++ /dev/null
@@ -1,151 +0,0 @@
-# vim: filetype=muttrc
-
-#
-#
-# make sure that you are using mutt linked against slang, not ncurses, or
-# suffer the consequences of weird color issues. use "mutt -v" to check this.
-
-# custom body highlights -----------------------------------------------
-# highlight my name and other personally relevant strings
-#color body yellow default "(ethan|schoonover)"
-# custom index highlights ----------------------------------------------
-# messages which mention my name in the body
-#color index yellow default "~b \"phil(_g|\!| gregory| gold)|pgregory\" !~N !~T !~F !~p !~P"
-#color index J_cream brightblack "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~N !~T !~F !~p !~P"
-#color index yellow cyan "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~T !~F !~p !~P"
-#color index yellow J_magent "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~F !~p !~P"
-## messages which are in reference to my mails
-#color index J_magent default "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" !~N !~T !~F !~p !~P"
-#color index J_magent brightblack "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~N !~T !~F !~p !~P"
-#color index J_magent cyan "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~T !~F !~p !~P"
-#color index J_magent red "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P"
-
-# for background in 16 color terminal, valid background colors include:
-# base03, bg, black, any of the non brights
-
-# basic colors ---------------------------------------------------------
-color normal brightblue default
-color error red default
-color tilde white default
-color message cyan default
-color markers red black
-color attachment black default
-color search brightmagenta default
-#color status J_black J_status
-color status brightblue white
-color indicator brightwhite yellow
-color tree yellow default # arrow in threads
-
-# basic monocolor screen
-mono bold bold
-mono underline underline
-mono indicator reverse
-mono error bold
-
-# index ----------------------------------------------------------------
-
-#color index red default "~D(!~p|~p)" # deleted
-#color index white default ~F # flagged
-#color index brightred default ~= # duplicate messages
-#color index brightcyan default "~A!~N!~T!~p!~Q!~F!~D!~P" # the rest
-#color index J_base default "~A~N!~T!~p!~Q!~F!~D" # the rest, new
-color index red default "~A" # all messages
-color index brightred default "~E" # expired messages
-color index blue default "~N" # new messages
-color index blue default "~O" # old messages
-color index brightmagenta default "~Q" # messages that have been replied to
-color index brightcyan default "~R" # read messages
-color index blue default "~U" # unread messages
-color index blue default "~U~$" # unread, unreferenced messages
-color index brightblue default "~v" # messages part of a collapsed thread
-color index brightblue default "~P" # messages from me
-color index cyan default "~p!~F" # messages to me
-color index cyan default "~N~p!~F" # new messages to me
-color index cyan default "~U~p!~F" # unread messages to me
-color index brightcyan default "~R~p!~F" # messages to me
-color index red default "~F" # flagged messages
-color index red default "~F~p" # flagged messages to me
-color index red default "~N~F" # new flagged messages
-color index red default "~N~F~p" # new flagged messages to me
-color index red default "~U~F~p" # new flagged messages to me
-color index white red "~D" # deleted messages
-color index brightgreen default "~v~(!~N)" # collapsed thread with no unread
-color index yellow default "~v~(~N)" # collapsed thread with some unread
-color index green default "~N~v~(~N)" # collapsed thread with unread parent
-# statusbg used to indicated flagged when foreground color shows other status
-# for collapsed thread
-color index red white "~v~(~F)!~N" # collapsed thread with flagged, no unread
-color index yellow white "~v~(~F~N)" # collapsed thread with some unread & flagged
-color index green white "~N~v~(~F~N)" # collapsed thread with unread parent & flagged
-color index green white "~N~v~(~F)" # collapsed thread with unread parent, no unread inside, but some flagged
-color index cyan white "~v~(~p)" # collapsed thread with unread parent, no unread inside, some to me directly
-color index yellow red "~v~(~D)" # thread with deleted (doesn't differentiate between all or partial)
-#color index yellow default "~(~N)" # messages in threads with some unread
-#color index green default "~S" # superseded messages
-#color index red default "~T" # tagged messages
-#color index brightred red "~=" # duplicated messages
-
-# message headers ------------------------------------------------------
-
-#color header brightcyan default "^"
-color hdrdefault brightcyan default
-color header brightblue default "^(From)"
-color header blue default "^(Subject)"
-
-# body -----------------------------------------------------------------
-
-color quoted blue default
-color quoted1 cyan default
-color quoted2 yellow default
-color quoted3 red default
-color quoted4 brightred default
-
-color signature brightcyan default
-color bold white default
-color underline white default
-color normal default default
-#
-color body brightgreen default "[;:][-o][)/(|]" # emoticons
-color body brightgreen default "[;:][)(|]" # emoticons
-color body brightgreen default "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\
- |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\
- |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?"
-color body brightgreen default "[ ][*][^*]*[*][ ]?" # more emoticon?
-color body brightgreen default "[ ]?[*][^*]*[*][ ]" # more emoticon?
-
-## pgp
-
-color body red default "(BAD signature)"
-color body cyan default "(Good signature)"
-color body brightwhite default "^gpg: Good signature .*"
-color body brightblue default "^gpg: "
-color body brightblue red "^gpg: BAD signature from.*"
-mono body bold "^gpg: Good signature"
-mono body bold "^gpg: BAD signature from.*"
-
-# yes, an insance URL regex
-color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
-# and a heavy handed email regex
-#color body J_magent default "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])"
-
-# Various smilies and the like
-#color body brightblack default "<[Gg]>" #
-#color body brightblack default "<[Bb][Gg]>" #
-#color body yellow default " [;:]-*[})>{(<|]" # :-) etc...
-# *bold*
-#color body blue default "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-#mono body bold "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-# _underline_
-#color body blue default "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-#mono body underline "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-# /italic/ (Sometimes gets directory names)
-#color body blue default "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-#mono body underline "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-
-# Border lines.
-#color body blue default "( *[-+=#*~_]){6,}"
-
-#folder-hook . "color status J_black J_status "
-#folder-hook gmail/inbox "color status J_black yellow "
-#folder-hook gmail/important "color status J_black yellow "
-
diff --git a/mutt-colors-solarized/mutt-colors-solarized-light-256.muttrc b/mutt-colors-solarized/mutt-colors-solarized-light-256.muttrc
deleted file mode 100644
index 4b3861d..0000000
--- a/mutt-colors-solarized/mutt-colors-solarized-light-256.muttrc
+++ /dev/null
@@ -1,151 +0,0 @@
-# vim: filetype=muttrc
-
-#
-#
-# make sure that you are using mutt linked against slang, not ncurses, or
-# suffer the consequences of weird color issues. use "mutt -v" to check this.
-
-# custom body highlights -----------------------------------------------
-# highlight my name and other personally relevant strings
-#color body color136 color233 "(ethan|schoonover)"
-# custom index highlights ----------------------------------------------
-# messages which mention my name in the body
-#color index color136 color233 "~b \"phil(_g|\!| gregory| gold)|pgregory\" !~N !~T !~F !~p !~P"
-#color index J_cream color233 "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~N !~T !~F !~p !~P"
-#color index color136 color37 "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~T !~F !~p !~P"
-#color index color136 J_magent "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~F !~p !~P"
-## messages which are in reference to my mails
-#color index J_magent color233 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" !~N !~T !~F !~p !~P"
-#color index J_magent color233 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~N !~T !~F !~p !~P"
-#color index J_magent color37 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~T !~F !~p !~P"
-#color index J_magent color160 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P"
-
-# for background in 16 color terminal, valid background colors include:
-# base03, bg, black, any of the non brights
-
-# basic colors ---------------------------------------------------------
-color normal color244 color233
-color error color160 color233
-color tilde color254 color233
-color message color37 color233
-color markers color160 color234
-color attachment color234 color233
-color search color61 color233
-#color status J_black J_status
-color status color244 color254
-color indicator color230 color136
-color tree color136 color233 # arrow in threads
-
-# basic monocolor screen
-mono bold bold
-mono underline underline
-mono indicator reverse
-mono error bold
-
-# index ----------------------------------------------------------------
-
-#color index color160 color233 "~D(!~p|~p)" # deleted
-#color index color254 color233 ~F # flagged
-#color index color166 color233 ~= # duplicate messages
-#color index color245 color233 "~A!~N!~T!~p!~Q!~F!~D!~P" # the rest
-#color index J_base color233 "~A~N!~T!~p!~Q!~F!~D" # the rest, new
-color index color160 color233 "~A" # all messages
-color index color166 color233 "~E" # expired messages
-color index color33 color233 "~N" # new messages
-color index color33 color233 "~O" # old messages
-color index color61 color233 "~Q" # messages that have been replied to
-color index color245 color233 "~R" # read messages
-color index color33 color233 "~U" # unread messages
-color index color33 color233 "~U~$" # unread, unreferenced messages
-color index color244 color233 "~v" # messages part of a collapsed thread
-color index color244 color233 "~P" # messages from me
-color index color37 color233 "~p!~F" # messages to me
-color index color37 color233 "~N~p!~F" # new messages to me
-color index color37 color233 "~U~p!~F" # unread messages to me
-color index color245 color233 "~R~p!~F" # messages to me
-color index color160 color233 "~F" # flagged messages
-color index color160 color233 "~F~p" # flagged messages to me
-color index color160 color233 "~N~F" # new flagged messages
-color index color160 color233 "~N~F~p" # new flagged messages to me
-color index color160 color233 "~U~F~p" # new flagged messages to me
-color index color254 color160 "~D" # deleted messages
-color index color239 color233 "~v~(!~N)" # collapsed thread with no unread
-color index color136 color233 "~v~(~N)" # collapsed thread with some unread
-color index color64 color233 "~N~v~(~N)" # collapsed thread with unread parent
-# statusbg used to indicated flagged when foreground color shows other status
-# for collapsed thread
-color index color160 color254 "~v~(~F)!~N" # collapsed thread with flagged, no unread
-color index color136 color254 "~v~(~F~N)" # collapsed thread with some unread & flagged
-color index color64 color254 "~N~v~(~F~N)" # collapsed thread with unread parent & flagged
-color index color64 color254 "~N~v~(~F)" # collapsed thread with unread parent, no unread inside, but some flagged
-color index color37 color254 "~v~(~p)" # collapsed thread with unread parent, no unread inside, some to me directly
-color index color136 color160 "~v~(~D)" # thread with deleted (doesn't differentiate between all or partial)
-#color index color136 color233 "~(~N)" # messages in threads with some unread
-#color index color64 color233 "~S" # superseded messages
-#color index color160 color233 "~T" # tagged messages
-#color index color166 color160 "~=" # duplicated messages
-
-# message headers ------------------------------------------------------
-
-#color header color245 color233 "^"
-color hdrdefault color245 color233
-color header color244 color233 "^(From)"
-color header color33 color233 "^(Subject)"
-
-# body -----------------------------------------------------------------
-
-color quoted color33 color233
-color quoted1 color37 color233
-color quoted2 color136 color233
-color quoted3 color160 color233
-color quoted4 color166 color233
-
-color signature color245 color233
-color bold color254 color233
-color underline color254 color233
-color normal color240 color233
-#
-color body color239 color233 "[;:][-o][)/(|]" # emoticons
-color body color239 color233 "[;:][)(|]" # emoticons
-color body color239 color233 "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\
- |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\
- |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?"
-color body color239 color233 "[ ][*][^*]*[*][ ]?" # more emoticon?
-color body color239 color233 "[ ]?[*][^*]*[*][ ]" # more emoticon?
-
-## pgp
-
-color body color160 color233 "(BAD signature)"
-color body color37 color233 "(Good signature)"
-color body color230 color233 "^gpg: Good signature .*"
-color body color244 color233 "^gpg: "
-color body color244 color160 "^gpg: BAD signature from.*"
-mono body bold "^gpg: Good signature"
-mono body bold "^gpg: BAD signature from.*"
-
-# yes, an insance URL regex
-color body color160 color233 "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
-# and a heavy handed email regex
-#color body J_magent color233 "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])"
-
-# Various smilies and the like
-#color body color233 color233 "<[Gg]>" #
-#color body color233 color233 "<[Bb][Gg]>" #
-#color body color136 color233 " [;:]-*[})>{(<|]" # :-) etc...
-# *bold*
-#color body color33 color233 "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-#mono body bold "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-# _underline_
-#color body color33 color233 "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-#mono body underline "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-# /italic/ (Sometimes gets directory names)
-#color body color33 color233 "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-#mono body underline "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-
-# Border lines.
-#color body color33 color233 "( *[-+=#*~_]){6,}"
-
-#folder-hook . "color status J_black J_status "
-#folder-hook gmail/inbox "color status J_black color136 "
-#folder-hook gmail/important "color status J_black color136 "
-
diff --git a/mutt-colors-solarized/mutt-colors-solarized-template.muttrc b/mutt-colors-solarized/mutt-colors-solarized-template.muttrc
deleted file mode 100644
index 491cbe6..0000000
--- a/mutt-colors-solarized/mutt-colors-solarized-template.muttrc
+++ /dev/null
@@ -1,151 +0,0 @@
-# vim: filetype=muttrc
-
-#
-#
-# make sure that you are using mutt linked against slang, not ncurses, or
-# suffer the consequences of weird color issues. use "mutt -v" to check this.
-
-# custom body highlights -----------------------------------------------
-# highlight my name and other personally relevant strings
-#color body J_yellow J_bg "(ethan|schoonover)"
-# custom index highlights ----------------------------------------------
-# messages which mention my name in the body
-#color index J_yellow J_bg "~b \"phil(_g|\!| gregory| gold)|pgregory\" !~N !~T !~F !~p !~P"
-#color index J_cream J_base3 "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~N !~T !~F !~p !~P"
-#color index J_yellow J_cyan "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~T !~F !~p !~P"
-#color index J_yellow J_magent "~b \"phil(_g|\!| gregory| gold)|pgregory\" ~F !~p !~P"
-## messages which are in reference to my mails
-#color index J_magent J_bg "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" !~N !~T !~F !~p !~P"
-#color index J_magent J_base3 "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~N !~T !~F !~p !~P"
-#color index J_magent J_cyan "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~T !~F !~p !~P"
-#color index J_magent J_red "~x \"(mithrandir|aragorn)\\.aperiodic\\.net|thorin\\.hillmgt\\.com\" ~F !~p !~P"
-
-# for background in 16 color terminal, valid background colors include:
-# base03, bg, black, any of the non brights
-
-# basic colors ---------------------------------------------------------
-color normal J_base00 J_bg
-color error J_red J_bg
-color tilde J_base02 J_bg
-color message J_cyan J_bg
-color markers J_red J_base2
-color attachment J_base2 J_bg
-color search J_violet J_bg
-#color status J_black J_status
-color status J_statusfg J_statusbg
-color indicator J_base03 J_yellow
-color tree J_yellow J_bg # arrow in threads
-
-# basic monocolor screen
-mono bold bold
-mono underline underline
-mono indicator reverse
-mono error bold
-
-# index ----------------------------------------------------------------
-
-#color index J_red J_bg "~D(!~p|~p)" # deleted
-#color index J_base02 J_bg ~F # flagged
-#color index J_orange J_bg ~= # duplicate messages
-#color index J_base01 J_bg "~A!~N!~T!~p!~Q!~F!~D!~P" # the rest
-#color index J_base J_bg "~A~N!~T!~p!~Q!~F!~D" # the rest, new
-color index J_red J_bg "~A" # all messages
-color index J_orange J_bg "~E" # expired messages
-color index J_blue J_bg "~N" # new messages
-color index J_blue J_bg "~O" # old messages
-color index J_violet J_bg "~Q" # messages that have been replied to
-color index J_base01 J_bg "~R" # read messages
-color index J_blue J_bg "~U" # unread messages
-color index J_blue J_bg "~U~$" # unread, unreferenced messages
-color index J_base00 J_bg "~v" # messages part of a collapsed thread
-color index J_base00 J_bg "~P" # messages from me
-color index J_cyan J_bg "~p!~F" # messages to me
-color index J_cyan J_bg "~N~p!~F" # new messages to me
-color index J_cyan J_bg "~U~p!~F" # unread messages to me
-color index J_base01 J_bg "~R~p!~F" # messages to me
-color index J_red J_bg "~F" # flagged messages
-color index J_red J_bg "~F~p" # flagged messages to me
-color index J_red J_bg "~N~F" # new flagged messages
-color index J_red J_bg "~N~F~p" # new flagged messages to me
-color index J_red J_bg "~U~F~p" # new flagged messages to me
-color index J_base02 J_red "~D" # deleted messages
-color index J_base1 J_bg "~v~(!~N)" # collapsed thread with no unread
-color index J_yellow J_bg "~v~(~N)" # collapsed thread with some unread
-color index J_green J_bg "~N~v~(~N)" # collapsed thread with unread parent
-# statusbg used to indicated flagged when foreground color shows other status
-# for collapsed thread
-color index J_red J_statusbg "~v~(~F)!~N" # collapsed thread with flagged, no unread
-color index J_yellow J_statusbg "~v~(~F~N)" # collapsed thread with some unread & flagged
-color index J_green J_statusbg "~N~v~(~F~N)" # collapsed thread with unread parent & flagged
-color index J_green J_statusbg "~N~v~(~F)" # collapsed thread with unread parent, no unread inside, but some flagged
-color index J_cyan J_statusbg "~v~(~p)" # collapsed thread with unread parent, no unread inside, some to me directly
-color index J_yellow J_red "~v~(~D)" # thread with deleted (doesn't differentiate between all or partial)
-#color index J_yellow J_bg "~(~N)" # messages in threads with some unread
-#color index J_green J_bg "~S" # superseded messages
-#color index J_red J_bg "~T" # tagged messages
-#color index J_orange J_red "~=" # duplicated messages
-
-# message headers ------------------------------------------------------
-
-#color header J_base01 J_bg "^"
-color hdrdefault J_base01 J_bg
-color header J_base00 J_bg "^(From)"
-color header J_blue J_bg "^(Subject)"
-
-# body -----------------------------------------------------------------
-
-color quoted J_blue J_bg
-color quoted1 J_cyan J_bg
-color quoted2 J_yellow J_bg
-color quoted3 J_red J_bg
-color quoted4 J_orange J_bg
-
-color signature J_base01 J_bg
-color bold J_base02 J_bg
-color underline J_base02 J_bg
-color normal J_fg J_bg
-#
-color body J_base1 J_bg "[;:][-o][)/(|]" # emoticons
-color body J_base1 J_bg "[;:][)(|]" # emoticons
-color body J_base1 J_bg "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\
- |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\
- |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?"
-color body J_base1 J_bg "[ ][*][^*]*[*][ ]?" # more emoticon?
-color body J_base1 J_bg "[ ]?[*][^*]*[*][ ]" # more emoticon?
-
-## pgp
-
-color body J_red J_bg "(BAD signature)"
-color body J_cyan J_bg "(Good signature)"
-color body J_base03 J_bg "^gpg: Good signature .*"
-color body J_base00 J_bg "^gpg: "
-color body J_base00 J_red "^gpg: BAD signature from.*"
-mono body bold "^gpg: Good signature"
-mono body bold "^gpg: BAD signature from.*"
-
-# yes, an insance URL regex
-color body J_red J_bg "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
-# and a heavy handed email regex
-#color body J_magent J_bg "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])"
-
-# Various smilies and the like
-#color body J_base3 J_bg "<[Gg]>" #
-#color body J_base3 J_bg "<[Bb][Gg]>" #
-#color body J_yellow J_bg " [;:]-*[})>{(<|]" # :-) etc...
-# *bold*
-#color body J_blue J_bg "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-#mono body bold "(^|[[:space:][:punct:]])\\*[^*]+\\*([[:space:][:punct:]]|$)"
-# _underline_
-#color body J_blue J_bg "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-#mono body underline "(^|[[:space:][:punct:]])_[^_]+_([[:space:][:punct:]]|$)"
-# /italic/ (Sometimes gets directory names)
-#color body J_blue J_bg "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-#mono body underline "(^|[[:space:][:punct:]])/[^/]+/([[:space:][:punct:]]|$)"
-
-# Border lines.
-#color body J_blue J_bg "( *[-+=#*~_]){6,}"
-
-#folder-hook . "color status J_black J_status "
-#folder-hook gmail/inbox "color status J_black J_yellow "
-#folder-hook gmail/important "color status J_black J_yellow "
-
diff --git a/mutt-colors-solarized/mutt-compile-colors.sh b/mutt-colors-solarized/mutt-compile-colors.sh
deleted file mode 100755
index f59fa58..0000000
--- a/mutt-colors-solarized/mutt-compile-colors.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-# ---------------------------------------------------------------------
-# SOLARIZED color values
-# ---------------------------------------------------------------------
-# Download palettes and files from: http://ethanschoonover.com/solarized
-#
-# SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB
-# --------- ------- ---- ------- ----------- ---------- ----------- -----------
-# base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21
-# base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26
-# base01 #586e75 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46
-# base00 #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51
-# base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59
-# base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63
-# base2 #eee8d5 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93
-# base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99
-# yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71
-# orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80
-# red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86
-# magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83
-# violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77
-# blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82
-# cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63
-# green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60
-
-cat > palette_dark.tmp < palette_light.tmp < "$MUTTTARGET-dark-256$MUTTSUFFIX"
-awk 'NR==FNR {a[$1]=$3;next} {for ( i in a) gsub(i,a[i])}1' FS="," \
- palette_dark.tmp $MUTTSOURCE > "$MUTTTARGET-dark-16$MUTTSUFFIX"
-awk 'NR==FNR {a[$1]=$2;next} {for ( i in a) gsub(i,a[i])}1' FS="," \
- palette_light.tmp $MUTTSOURCE > "$MUTTTARGET-light-256$MUTTSUFFIX"
-awk 'NR==FNR {a[$1]=$3;next} {for ( i in a) gsub(i,a[i])}1' FS="," \
- palette_light.tmp $MUTTSOURCE > "$MUTTTARGET-light-16$MUTTSUFFIX"
-
-rm palette_light.tmp
-rm palette_dark.tmp
diff --git a/osx-terminal.app-colors-solarized/README.md b/osx-terminal.app-colors-solarized/README.md
deleted file mode 100644
index f7d6e2f..0000000
--- a/osx-terminal.app-colors-solarized/README.md
+++ /dev/null
@@ -1,56 +0,0 @@
-Solarized - OS X Terminal.App Settings
-======================================
-
-### [See official homepage for full content](http://ethanschoonover.com/solarized)
-
-Installation
-------------
-
-Terminal.app doesn't have full color modification support without some effort.
-The following has only been tested on Snow Leopard. See the links below for
-updates. I make no claims as to the effectiveness of these methods. iTerm2 may
-be an easier all roung solution (desptie iTerm 2's terrible color management).
-
-1. Install SIMBL from:
-http://www.culater.net/software/SIMBL/SIMBL.php
-
-2. Install updated "TerminalColors" SIMBL plugin
-https://github.com/timmfin/terminalcolours
-http://github.com/timmfin/terminalcolours/raw/master/TerminalColours-SL-64bit.zip
-
-( see blog post here for details:
-http://www.byteengine.net/custom-colors-in-snow-leopard-terminal-64-bit )
-
-The above runs in both 64 bit and 32 bit mode. If you have trouble using it,
-you can also try the older 32-bit mode only TerminalColors plugin below:
-
-http://blog.fallingsnow.net/2009/08/28/fixing-colors-in-terminal-app-on-10-6/
-http://cloud.github.com/downloads/evanphx/terminalcolours/TerminalColours-SL.tar.gz
-and open in 32 bit mode
-cf
-https://github.com/evanphx/terminalcolours
-
-The Values
-----------
-
-L\*a\*b values are canonical (White D65, Reference D50), other values are
-matched in sRGB space.
-
- SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB
- --------- ------- ---- ------- ----------- ---------- ----------- -----------
- base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21
- base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26
- base01 #586e75 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46
- base00 #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51
- base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59
- base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63
- base2 #eee8d5 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93
- base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99
- yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71
- orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80
- red #d30102 1/1 red 124 #af0000 45 70 60 211 1 2 0 99 83
- magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83
- violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77
- blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82
- cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63
- green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60
diff --git a/osx-terminal.app-colors-solarized/Solarized Dark.terminal b/osx-terminal.app-colors-solarized/Solarized Dark.terminal
deleted file mode 100644
index 3fe2a09..0000000
--- a/osx-terminal.app-colors-solarized/Solarized Dark.terminal
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
-
-
- BackgroundColor
-
- YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
- AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB
- TxAtMC4wMTU5MjQ0MDUzMSAwLjEyNjUyMDkxNjggMC4xNTk2OTYwMTI3IDAuOTYA0hAR
- EhNaJGNsYXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXll
- ZEFyY2hpdmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpabpq+3usPV2N0AAAAAAAAB
- AQAAAAAAAAAZAAAAAAAAAAAAAAAAAAAA3w==
-
- CursorColor
-
- YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
- AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB
- TxAnMC40NDA1ODAyNDg4IDAuNTA5NjI5MzA5MiAwLjUxNjg1Nzk4MTcA0hAREhNaJGNs
- YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
- dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
- AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-
- Font
-
- YnBsaXN0MDDUAQIDBAUGGBlYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
- AAGGoKQHCBESVSRudWxs1AkKCwwNDg8QViRjbGFzc1ZOU05hbWVWTlNTaXplWE5TZkZs
- YWdzgAOAAiNAJgAAAAAAABAQXU1lbmxvLVJlZ3VsYXLSExQVFlokY2xhc3NuYW1lWCRj
- bGFzc2VzVk5TRm9udKIVF1hOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEaG1Ryb290
- gAEIERojLTI3PEJLUllgaWttdniGi5afpqmyxMfMAAAAAAAAAQEAAAAAAAAAHAAAAAAA
- AAAAAAAAAAAAAM4=
-
- FontAntialias
-
- FontWidthSpacing
- 1.004032258064516
- ProfileCurrentVersion
- 2.0099999999999998
- SelectionColor
-
- YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
- AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB
- TxAoMC4wMzkzODA3MzY2NSAwLjE2MDExNjQ2MzkgMC4xOTgzMzI3NTY4ANIQERITWiRj
- bGFzc25hbWVYJGNsYXNzZXNXTlNDb2xvcqISFFhOU09iamVjdF8QD05TS2V5ZWRBcmNo
- aXZlctEXGFRyb290gAEIERojLTI3O0FIT1xiZGaRlqGqsrW+0NPYAAAAAAAAAQEAAAAA
- AAAAGQAAAAAAAAAAAAAAAAAAANo=
-
- TextBoldColor
-
- YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
- AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB
- TxAmMC41MDU5OTE5MzU3IDAuNTY0ODU4Mzc3IDAuNTYzNjM2NTQxNADSEBESE1okY2xh
- c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2
- ZXLRFxhUcm9vdIABCBEaIy0yNztBSE9cYmRmj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA
- ABkAAAAAAAAAAAAAAAAAAADY
-
- TextColor
-
- YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
- AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB
- TxAnMC40NDA1ODAyNDg4IDAuNTA5NjI5MzA5MiAwLjUxNjg1Nzk4MTcA0hAREhNaJGNs
- YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
- dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
- AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-
- UseBrightBold
-
- blackColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg7JNIT2DkvUjPoO+F0s+AYY=
-
- blueColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmgyqcAj6DtOHsPoO+RUg/AYY=
-
- brightBlackColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg+ZzgjyDs44BPoNahyM+AYY=
-
- brightBlueColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg7yT4T6DEXcCP4POUAQ/AYY=
-
- brightCyanColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg7CIAT+Dj5oQP4N8ShA/AYY=
-
- brightGreenColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmgzyujT6DFZy2PoOYFsQ+AYY=
-
- brightMagentaColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmgxMjsj6D+uazPoNkyTc/AYY=
-
- brightRedColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmgyfkPT+D/15aPoMgl5Y9AYY=
-
- brightWhiteColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg49LfT+D0Dt1P4MGM10/AYY=
-
- brightYellowColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg1MTpj6DeHnQPoPQg+A+AYY=
-
- cyanColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg4VRFj6DfyESP4PkZwY/AYY=
-
- greenColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg9lI5j6DIYkKP4PVjKU8AYY=
-
- magentaColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg/4CRz+DBTzdPYMgzt4+AYY=
-
- name
- Solarized Dark
- redColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg6i7UT+DUATePYMl2hA+AYY=
-
- type
- Window Settings
- whiteColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmgzqGaj+D2tdjP4NYPUw/AYY=
-
- yellowColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg0DAJT+DB17vPoM4Y8A8AYY=
-
-
-
diff --git a/osx-terminal.app-colors-solarized/Solarized Light.terminal b/osx-terminal.app-colors-solarized/Solarized Light.terminal
deleted file mode 100644
index a5be626..0000000
--- a/osx-terminal.app-colors-solarized/Solarized Light.terminal
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
-
-
- BackgroundColor
-
- YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
- AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB
- TxAsMC45ODk0MzQxODI2IDAuOTU3OTQzOTE2MyAwLjg2NDA1OTgwNTkgMC45NgDSEBES
- E1okY2xhc3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVk
- QXJjaGl2ZXLRFxhUcm9vdIABCBEaIy0yNztBSE9cYmRmlZqlrra5wtTX3AAAAAAAAAEB
- AAAAAAAAABkAAAAAAAAAAAAAAAAAAADe
-
- CursorColor
-
- YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
- AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB
- TxAmMC4zMjQzNjYxODIxIDAuNDA3MTc2NzMzIDAuNDM4NTA1NjQ5NgDSEBESE1okY2xh
- c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2
- ZXLRFxhUcm9vdIABCBEaIy0yNztBSE9cYmRmj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA
- ABkAAAAAAAAAAAAAAAAAAADY
-
- Font
-
- YnBsaXN0MDDUAQIDBAUGGBlYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
- AAGGoKQHCBESVSRudWxs1AkKCwwNDg8QViRjbGFzc1ZOU05hbWVWTlNTaXplWE5TZkZs
- YWdzgAOAAiNAJgAAAAAAABAQXU1lbmxvLVJlZ3VsYXLSExQVFlokY2xhc3NuYW1lWCRj
- bGFzc2VzVk5TRm9udKIVF1hOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEaG1Ryb290
- gAEIERojLTI3PEJLUllgaWttdniGi5afpqmyxMfMAAAAAAAAAQEAAAAAAAAAHAAAAAAA
- AAAAAAAAAAAAAM4=
-
- FontAntialias
-
- FontWidthSpacing
- 1.004032258064516
- ProfileCurrentVersion
- 2.0099999999999998
- SelectionColor
-
- YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
- AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB
- TxAnMC45MTYxMTA2MzQ4IDAuODkwMDEyMzgzNSAwLjc5NzgxMTAzMTMA0hAREhNaJGNs
- YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
- dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
- AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-
- TextBoldColor
-
- YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
- AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB
- TxAnMC4yNzY3MTk5Mjc4IDAuMzU2NjU5NTYxNCAwLjM4Mjk4NDg3NjYA0hAREhNaJGNs
- YXNzbmFtZVgkY2xhc3Nlc1dOU0NvbG9yohIUWE5TT2JqZWN0XxAPTlNLZXllZEFyY2hp
- dmVy0RcYVHJvb3SAAQgRGiMtMjc7QUhPXGJkZpCVoKmxtL3P0tcAAAAAAAABAQAAAAAA
- AAAZAAAAAAAAAAAAAAAAAAAA2Q==
-
- TextColor
-
- YnBsaXN0MDDUAQIDBAUGFRZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS
- AAGGoKMHCA9VJG51bGzTCQoLDA0OViRjbGFzc1xOU0NvbG9yU3BhY2VVTlNSR0KAAhAB
- TxAmMC4zMjQzNjYxODIxIDAuNDA3MTc2NzMzIDAuNDM4NTA1NjQ5NgDSEBESE1okY2xh
- c3NuYW1lWCRjbGFzc2VzV05TQ29sb3KiEhRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2
- ZXLRFxhUcm9vdIABCBEaIy0yNztBSE9cYmRmj5SfqLCzvM7R1gAAAAAAAAEBAAAAAAAA
- ABkAAAAAAAAAAAAAAAAAAADY
-
- UseBrightBold
-
- blackColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg7JNIT2DkvUjPoO+F0s+AYY=
-
- blueColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmgyqcAj6DtOHsPoO+RUg/AYY=
-
- brightBlackColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg+ZzgjyDs44BPoNahyM+AYY=
-
- brightBlueColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg7yT4T6DEXcCP4POUAQ/AYY=
-
- brightCyanColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg7CIAT+Dj5oQP4N8ShA/AYY=
-
- brightGreenColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmgzyujT6DFZy2PoOYFsQ+AYY=
-
- brightMagentaColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmgxMjsj6D+uazPoNkyTc/AYY=
-
- brightRedColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmgyfkPT+D/15aPoMgl5Y9AYY=
-
- brightWhiteColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg49LfT+D0Dt1P4MGM10/AYY=
-
- brightYellowColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg1MTpj6DeHnQPoPQg+A+AYY=
-
- cyanColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg4VRFj6DfyESP4PkZwY/AYY=
-
- greenColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg9lI5j6DIYkKP4PVjKU8AYY=
-
- magentaColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg/4CRz+DBTzdPYMgzt4+AYY=
-
- name
- Solarized Light
- redColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg6i7UT+DUATePYMl2hA+AYY=
-
- type
- Window Settings
- whiteColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmgzqGaj+D2tdjP4NYPUw/AYY=
-
- yellowColour
-
- BAtzdHJlYW10eXBlZIHoA4QBQISEhAdOU0NvbG9yAISECE5TT2JqZWN0AIWEAWMBhARm
- ZmZmg0DAJT+DB17vPoM4Y8A8AYY=
-
-
-
diff --git a/utils/README.md b/utils/README.md
deleted file mode 100644
index 7d35c77..0000000
--- a/utils/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-These are used only for testing and packaging Solarized into release formats.
-Disregard unless you are into ugly ex and quick and dirty shell scripts.
diff --git a/utils/package.sh b/utils/package.sh
deleted file mode 100755
index 33c356a..0000000
--- a/utils/package.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-export COPYFILE_DISABLE=true
-rm -rf ~/tmp/solarized*
-cp -r ~/wrk/solarized ~/tmp/
-cd ~/tmp/solarized
-rm -rf .*
-rm -rf **/.*
-rm **/*.un~
-rm -rf img
-rm -rf tests
-rm -rf utils
-
-mkdir ~/tmp/solarized-packaged
-
-cd ~/tmp
-gnutar -czvf ~/tmp/solarized-packaged/solarized.tar.gz solarized
-zip -rvX ~/tmp/solarized-packaged/solarized.zip solarized
-cp ~/tmp/solarized-packaged/solarized.tar.gz ~/tmp/solarized-packaged/solarized-$1.tar.gz
-cp ~/tmp/solarized-packaged/solarized.zip ~/tmp/solarized-packaged/solarized-$1.zip
-
-cd ~/tmp/solarized
-gnutar -czvf ~/tmp/solarized-packaged/vim-colors-solarized.tar.gz vim-colors-solarized
-gnutar -czvf ~/tmp/solarized-packaged/mutt-colors-solarized.tar.gz mutt-colors-solarized
-zip -rvX ~/tmp/solarized-packaged/vim-colors-solarized.zip vim-colors-solarized
-zip -rvX ~/tmp/solarized-packaged/mutt-colors-solarized.zip mutt-colors-solarized
-
-cp ~/tmp/solarized-packaged/vim-colors-solarized.tar.gz ~/tmp/solarized-packaged/vim-colors-solarized-$1.tar.gz
-cp ~/tmp/solarized-packaged/mutt-colors-solarized.tar.gz ~/tmp/solarized-packaged/mutt-colors-solarized-$1.tar.gz
-cp ~/tmp/solarized-packaged/vim-colors-solarized.zip ~/tmp/solarized-packaged/vim-colors-solarized-$1.zip
-cp ~/tmp/solarized-packaged/mutt-colors-solarized.zip ~/tmp/solarized-packaged/mutt-colors-solarized-$1.zip
-
-cd ~/tmp
-rm -rf solarized
-
diff --git a/utils/pandoc2readme b/utils/pandoc2readme
deleted file mode 100644
index b8a8172..0000000
--- a/utils/pandoc2readme
+++ /dev/null
@@ -1,4 +0,0 @@
-%s+(/img/solarized/+(https://github.com/altercation/solarized/raw/master/img/+g
-g/\%^---/,/^---\s*$/d
-g/\%^$/d
-g/^The Values$/+6,/\%$/ s /^/ /
diff --git a/utils/tests/test.c b/utils/tests/test.c
deleted file mode 100644
index 7e88404..0000000
--- a/utils/tests/test.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#define UNICODE
-#include
-
-int main(int argc, char **argv) {
- int speed = 0, speed1 = 0, speed2 = 0; // 1-20
- printf("Set Mouse Speed by Maverick\n");
-
- SystemParametersInfo(SPI_GETMOUSESPEED, 0, &speed, 0);
- printf("Current speed: %2d\n", speed);
-
- if (argc == 1) return 0;
- if (argc >= 2) sscanf(argv[1], "%d", &speed1);
- if (argc >= 3) sscanf(argv[2], "%d", &speed2);
-
- if (argc == 2) // set speed to first value
- speed = speed1;
- else if (speed == speed1 || speed == speed2) // alternate
- speed = speed1 + speed2 - speed;
- else
- speed = speed1; // start with first value
-
- SystemParametersInfo(SPI_SETMOUSESPEED, 0, speed, 0);
- SystemParametersInfo(SPI_GETMOUSESPEED, 0, &speed, 0);
- printf("New speed: %2d\n", speed);
- return 0;
-}
diff --git a/utils/tests/test.hs b/utils/tests/test.hs
deleted file mode 100644
index d1d18e6..0000000
--- a/utils/tests/test.hs
+++ /dev/null
@@ -1,40 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
-module Main where
-
---import Prelude hiding (id)
---import Control.Category (id)
-import Control.Arrow ((>>>), (***), arr)
-import Control.Monad (forM_)
--- import Data.Monoid (mempty, mconcat)
-
--- import System.FilePath
-
-import Hakyll
-
-
-main :: IO ()
-main = hakyll $ do
-
- route "css/*" $ setExtension "css"
- compile "css/*" $ byExtension (error "Not a (S)CSS file")
- [ (".css", compressCssCompiler)
- , (".scss", sass)
- ]
-
- route "js/**" idRoute
- compile "js/**" copyFileCompiler
-
- route "img/*" idRoute
- compile "img/*" copyFileCompiler
-
- compile "templates/*" templateCompiler
-
- forM_ ["test.md", "index.md"] $ \page -> do
- route page $ setExtension "html"
- compile page $ pageCompiler
- >>> applyTemplateCompiler "templates/default.html"
- >>> relativizeUrlsCompiler
-
-sass :: Compiler Resource String
-sass = getResourceString >>> unixFilter "sass" ["-s", "--scss"]
- >>> arr compressCss
diff --git a/utils/tests/test.html b/utils/tests/test.html
deleted file mode 100644
index 2997a45..0000000
--- a/utils/tests/test.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-A Tiny Page
-
-
-
-abc
-def
-Testing page
-
-
diff --git a/utils/tests/test.java b/utils/tests/test.java
deleted file mode 100644
index 55133df..0000000
--- a/utils/tests/test.java
+++ /dev/null
@@ -1,16 +0,0 @@
-import java.util.Map;
-import java.util.TreeSet;
-
-public class GetEnv {
- /**
- * let's test generics
- * @param args the command line arguments
- */
- public static void main(String[] args) {
- // get a map of environment variables
- Map env = System.getenv();
- // build a sorted set out of the keys and iterate
- for(String k: new TreeSet(env.keySet())) {
- System.out.printf("%s = %s\n", k, env.get(k));
- }
- } }
diff --git a/utils/tests/test.md b/utils/tests/test.md
deleted file mode 100644
index ea8b386..0000000
--- a/utils/tests/test.md
+++ /dev/null
@@ -1,30 +0,0 @@
-% Pandoc Test File
-% Ethan Schoonover
-% March 22, 2011
-
-%% format: markdown+lhs
-
-The following blockquote can *optionally* be shown as Literate Haskell using
-a global variable in your .vimrc or a __*mode*line__ such as the one above
-specifying the format of the document and the +lhs suffix
-
-> import Hakyll
-> main :: IO ()
-> main = hakyll $ do
-> compile "css/*" $ byExtension (error "Not a (S)CSS file")
-
-Using *Pandoc*
-=============
-
-In this document the technical terms `water` and `ice` will be replaced by
-H~2~O.^[a contrived footnote]
-
-## Heading styles can be mixed
-
-And matched, and they still fold **properly**
-
-* * * *
-
-Some code:
-
- a verbatim or "code" block
diff --git a/utils/tests/test.pl b/utils/tests/test.pl
deleted file mode 100644
index 71db713..0000000
--- a/utils/tests/test.pl
+++ /dev/null
@@ -1,33 +0,0 @@
-#!perl -w
-
-# Time-stamp: <2002/04/06, 13:12:13 (EST), maverick, csvformat.pl>
-# Two pass CSV file to table formatter
-
-$delim = $#ARGV >= 1 ? $ARGV[1] : ',';
-print STDERR "Split pattern: $delim\n";
-
-# first pass
-open F, "<$ARGV[0]" or die;
-while()
-{
- chomp;
- $i = 0;
- map { $max[$_->[1]] = $_->[0] if $_->[0] > ($max[$_->[1]] || 0) }
- (map {[length $_, $i++]} split($delim));
-}
-close F;
-
-print STDERR 'Field width: ', join(', ', @max), "\n";
-print STDERR join(' ', map {'-' x $_} @max);
-
-# second pass
-open F, "<$ARGV[0]" or die;
-while()
- {
- chomp;
- $i = 0;
- map { printf("%-$max[$_->[1]]s ", $_->[0]) }
- (map {[$_, $i++]} split($delim));
- print "\n";
-}
-close F;
diff --git a/utils/tests/test.py b/utils/tests/test.py
deleted file mode 100644
index 5b8f258..0000000
--- a/utils/tests/test.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# test python (sample from offlineimap)
-
-class ExitNotifyThread(Thread):
- """This class is designed to alert a "monitor" to the fact that a thread has
- exited and to provide for the ability for it to find out why."""
- def run(self):
- global exitthreads, profiledir
- self.threadid = thread.get_ident()
- try:
- if not profiledir: # normal case
- Thread.run(self)
- else:
- try:
- import cProfile as profile
- except ImportError:
- import profile
- prof = profile.Profile()
- try:
- prof = prof.runctx("Thread.run(self)", globals(), locals())
- except SystemExit:
- pass
- prof.dump_stats( \
- profiledir + "/" + str(self.threadid) + "_" + \
- self.getName() + ".prof")
- except:
- self.setExitCause('EXCEPTION')
- if sys:
- self.setExitException(sys.exc_info()[1])
- tb = traceback.format_exc()
- self.setExitStackTrace(tb)
- else:
- self.setExitCause('NORMAL')
- if not hasattr(self, 'exitmessage'):
- self.setExitMessage(None)
-
- if exitthreads:
- exitthreads.put(self, True)
-
- def setExitCause(self, cause):
- self.exitcause = cause
- def getExitCause(self):
- """Returns the cause of the exit, one of:
- 'EXCEPTION' -- the thread aborted because of an exception
- 'NORMAL' -- normal termination."""
- return self.exitcause
- def setExitException(self, exc):
- self.exitexception = exc
- def getExitException(self):
- """If getExitCause() is 'EXCEPTION', holds the value from
- sys.exc_info()[1] for this exception."""
- return self.exitexception
- def setExitStackTrace(self, st):
- self.exitstacktrace = st
- def getExitStackTrace(self):
- """If getExitCause() is 'EXCEPTION', returns a string representing
- the stack trace for this exception."""
- return self.exitstacktrace
- def setExitMessage(self, msg):
- """Sets the exit message to be fetched by a subsequent call to
- getExitMessage. This message may be any object or type except
- None."""
- self.exitmessage = msg
- def getExitMessage(self):
- """For any exit cause, returns the message previously set by
- a call to setExitMessage(), or None if there was no such message
- set."""
- return self.exitmessage
diff --git a/utils/tests/test.rb b/utils/tests/test.rb
deleted file mode 100644
index 8decfba..0000000
--- a/utils/tests/test.rb
+++ /dev/null
@@ -1,1436 +0,0 @@
-# ruby test file ruby.rb
-
-def File.binread(fname)
- open(fname, 'rb') {|f|
- return f.read
- }
-end
-
-class ConfigTable
-
- include Enumerable
-
- def initialize(rbconfig)
- @rbconfig = rbconfig
- @no_harm = false
- end
-
- def load_savefile
- begin
- File.foreach(savefile()) do |line|
- k, v = *line.split(/=/, 2)
- self[k] = v.strip
- end
- rescue Errno::ENOENT
- setup_rb_error $!.message + "\n#{File.basename($0)} config first"
- end
- end
-
- if c['rubylibdir']
- # V > 1.6.3
- libruby = "#{c['prefix']}/lib/ruby"
- librubyver = c['rubylibdir']
- librubyverarch = c['archdir']
- siteruby = c['sitedir']
- siterubyver = c['sitelibdir']
- siterubyverarch = c['sitearchdir']
- end
- parameterize = lambda {|path|
- path.sub(/\A#{Regexp.quote(c['prefix'])}/, '$prefix')
- }
-
- if arg = c['configure_args'].split.detect {|arg| /--with-make-prog=/ =~ arg }
- makeprog = arg.sub(/'/, '').split(/=/, 2)[1]
- else
- makeprog = 'make'
- end
-
- [
- ExecItem.new('installdirs', 'std/site/home',
- 'std: install under libruby; site: install under site_ruby; home: install under $HOME')\
- {|val, table|
- case val
- when 'std'
- table['rbdir'] = '$librubyver'
- table['sodir'] = '$librubyverarch'
- when 'site'
- table['rbdir'] = '$siterubyver'
- table['sodir'] = '$siterubyverarch'
- when 'home'
- setup_rb_error '$HOME was not set' unless ENV['HOME']
- table['prefix'] = ENV['HOME']
- table['rbdir'] = '$libdir/ruby'
- table['sodir'] = '$libdir/ruby'
- end
- },
- PathItem.new('prefix', 'path', c['prefix'],
- 'path prefix of target environment'),
- PathItem.new('bindir', 'path', parameterize.call(c['bindir']),
- 'the directory for commands'),
- PathItem.new('libdir', 'path', parameterize.call(c['libdir']),
- 'the directory for libraries'),
- PathItem.new('datadir', 'path', parameterize.call(c['datadir']),
- 'the directory for shared data'),
- PathItem.new('mandir', 'path', parameterize.call(c['mandir']),
- 'the directory for man pages'),
- PathItem.new('sysconfdir', 'path', parameterize.call(c['sysconfdir']),
- 'the directory for system configuration files'),
- PathItem.new('localstatedir', 'path', parameterize.call(c['localstatedir']),
- 'the directory for local state data'),
- PathItem.new('libruby', 'path', libruby,
- 'the directory for ruby libraries'),
- PathItem.new('librubyver', 'path', librubyver,
- 'the directory for standard ruby libraries'),
- PathItem.new('librubyverarch', 'path', librubyverarch,
- 'the directory for standard ruby extensions'),
- PathItem.new('siteruby', 'path', siteruby,
- 'the directory for version-independent aux ruby libraries'),
- PathItem.new('siterubyver', 'path', siterubyver,
- 'the directory for aux ruby libraries'),
- PathItem.new('siterubyverarch', 'path', siterubyverarch,
- 'the directory for aux ruby binaries'),
- PathItem.new('rbdir', 'path', '$siterubyver',
- 'the directory for ruby scripts'),
- PathItem.new('sodir', 'path', '$siterubyverarch',
- 'the directory for ruby extentions'),
- PathItem.new('rubypath', 'path', rubypath,
- 'the path to set to #! line'),
- ProgramItem.new('rubyprog', 'name', rubypath,
- 'the ruby program using for installation'),
- ProgramItem.new('makeprog', 'name', makeprog,
- 'the make program to compile ruby extentions'),
- SelectItem.new('shebang', 'all/ruby/never', 'ruby',
- 'shebang line (#!) editing mode'),
- BoolItem.new('without-ext', 'yes/no', 'no',
- 'does not compile/install ruby extentions')
- ]
- end
- private :standard_entries
-
- def load_multipackage_entries
- multipackage_entries().each do |ent|
- add ent
- end
- end
-
- def multipackage_entries
- [
- PackageSelectionItem.new('with', 'name,name...', '', 'ALL',
- 'package names that you want to install'),
- PackageSelectionItem.new('without', 'name,name...', '', 'NONE',
- 'package names that you do not want to install')
- ]
- end
- private :multipackage_entries
-
- ALIASES = {
- 'std-ruby' => 'librubyver',
- 'stdruby' => 'librubyver',
- 'rubylibdir' => 'librubyver',
- 'archdir' => 'librubyverarch',
- 'site-ruby-common' => 'siteruby', # For backward compatibility
- 'site-ruby' => 'siterubyver', # For backward compatibility
- 'bin-dir' => 'bindir',
- 'bin-dir' => 'bindir',
- 'rb-dir' => 'rbdir',
- 'so-dir' => 'sodir',
- 'data-dir' => 'datadir',
- 'ruby-path' => 'rubypath',
- 'ruby-prog' => 'rubyprog',
- 'ruby' => 'rubyprog',
- 'make-prog' => 'makeprog',
- 'make' => 'makeprog'
- }
-
- def fixup
- ALIASES.each do |ali, name|
- @table[ali] = @table[name]
- end
- @items.freeze
- @table.freeze
- @options_re = /\A--(#{@table.keys.join('|')})(?:=(.*))?\z/
- end
-
- def parse_opt(opt)
- m = @options_re.match(opt) or setup_rb_error "config: unknown option #{opt}"
- m.to_a[1,2]
- end
-
- def dllext
- @rbconfig['DLEXT']
- end
-
- def value_config?(name)
- lookup(name).value?
- end
-
- class Item
- def initialize(name, template, default, desc)
- @name = name.freeze
- @template = template
- @value = default
- @default = default
- @description = desc
- end
-
- attr_reader :name
- attr_reader :description
-
- attr_accessor :default
- alias help_default default
-
- def help_opt
- "--#{@name}=#{@template}"
- end
-
- def value?
- true
- end
-
- def value
- @value
- end
-
- def resolve(table)
- @value.gsub(%r<\$([^/]+)>) { table[$1] }
- end
-
- def set(val)
- @value = check(val)
- end
-
- private
-
- def check(val)
- setup_rb_error "config: --#{name} requires argument" unless val
- val
- end
- end
-
- class BoolItem < Item
- def config_type
- 'bool'
- end
-
- def help_opt
- "--#{@name}"
- end
-
- private
-
- def check(val)
- return 'yes' unless val
- case val
- when /\Ay(es)?\z/i, /\At(rue)?\z/i then 'yes'
- when /\An(o)?\z/i, /\Af(alse)\z/i then 'no'
- else
- setup_rb_error "config: --#{@name} accepts only yes/no for argument"
- end
- end
- end
-
- class PathItem < Item
- def config_type
- 'path'
- end
-
- private
-
- def check(path)
- setup_rb_error "config: --#{@name} requires argument" unless path
- path[0,1] == '$' ? path : File.expand_path(path)
- end
- end
-
- class ProgramItem < Item
- def config_type
- 'program'
- end
- end
-
- class SelectItem < Item
- def initialize(name, selection, default, desc)
- super
- @ok = selection.split('/')
- end
-
- def config_type
- 'select'
- end
-
- private
-
- def check(val)
- unless @ok.include?(val.strip)
- setup_rb_error "config: use --#{@name}=#{@template} (#{val})"
- end
- val.strip
- end
- end
-
- class ExecItem < Item
- def initialize(name, selection, desc, &block)
- super name, selection, nil, desc
- @ok = selection.split('/')
- @action = block
- end
-
- def config_type
- 'exec'
- end
-
- def value?
- false
- end
-
- def resolve(table)
- setup_rb_error "$#{name()} wrongly used as option value"
- end
-
- undef set
-
- def evaluate(val, table)
- v = val.strip.downcase
- unless @ok.include?(v)
- setup_rb_error "invalid option --#{@name}=#{val} (use #{@template})"
- end
- @action.call v, table
- end
- end
-
- class PackageSelectionItem < Item
- def initialize(name, template, default, help_default, desc)
- super name, template, default, desc
- @help_default = help_default
- end
-
- attr_reader :help_default
-
- def config_type
- 'package'
- end
-
- private
-
- def check(val)
- unless File.dir?("packages/#{val}")
- setup_rb_error "config: no such package: #{val}"
- end
- val
- end
- end
-
- class MetaConfigEnvironment
- def initialize(config, installer)
- @config = config
- @installer = installer
- end
-
- def config_names
- @config.names
- end
-
- def config?(name)
- @config.key?(name)
- end
-
- def bool_config?(name)
- @config.lookup(name).config_type == 'bool'
- end
-
- def path_config?(name)
- @config.lookup(name).config_type == 'path'
- end
-
- def value_config?(name)
- @config.lookup(name).config_type != 'exec'
- end
-
- def add_config(item)
- @config.add item
- end
-
- def add_bool_config(name, default, desc)
- @config.add BoolItem.new(name, 'yes/no', default ? 'yes' : 'no', desc)
- end
-
- def add_path_config(name, default, desc)
- @config.add PathItem.new(name, 'path', default, desc)
- end
-
- def set_config_default(name, default)
- @config.lookup(name).default = default
- end
-
- def remove_config(name)
- @config.remove(name)
- end
-
- # For only multipackage
- def packages
- raise '[setup.rb fatal] multi-package metaconfig API packages() called for single-package; contact application package vendor' unless @installer
- @installer.packages
- end
-
- # For only multipackage
- def declare_packages(list)
- raise '[setup.rb fatal] multi-package metaconfig API declare_packages() called for single-package; contact application package vendor' unless @installer
- @installer.packages = list
- end
- end
-
-end # class ConfigTable
-
-
-# This module requires: #verbose?, #no_harm?
-module FileOperations
-
- def mkdir_p(dirname, prefix = nil)
- dirname = prefix + File.expand_path(dirname) if prefix
- $stderr.puts "mkdir -p #{dirname}" if verbose?
- return if no_harm?
-
- # Does not check '/', it's too abnormal.
- dirs = File.expand_path(dirname).split(%r<(?=/)>)
- if /\A[a-z]:\z/i =~ dirs[0]
- disk = dirs.shift
- dirs[0] = disk + dirs[0]
- end
- dirs.each_index do |idx|
- path = dirs[0..idx].join('')
- Dir.mkdir path unless File.dir?(path)
- end
- end
-
- def rm_f(path)
- $stderr.puts "rm -f #{path}" if verbose?
- return if no_harm?
- force_remove_file path
- end
-
- def rm_rf(path)
- $stderr.puts "rm -rf #{path}" if verbose?
- return if no_harm?
- remove_tree path
- end
-
- def remove_tree(path)
- if File.symlink?(path)
- remove_file path
- elsif File.dir?(path)
- remove_tree0 path
- else
- force_remove_file path
- end
- end
-
- def remove_tree0(path)
- Dir.foreach(path) do |ent|
- next if ent == '.'
- next if ent == '..'
- entpath = "#{path}/#{ent}"
- if File.symlink?(entpath)
- remove_file entpath
- elsif File.dir?(entpath)
- remove_tree0 entpath
- else
- force_remove_file entpath
- end
- end
- begin
- Dir.rmdir path
- rescue Errno::ENOTEMPTY
- # directory may not be empty
- end
- end
-
- def move_file(src, dest)
- force_remove_file dest
- begin
- File.rename src, dest
- rescue
- File.open(dest, 'wb') {|f|
- f.write File.binread(src)
- }
- File.chmod File.stat(src).mode, dest
- File.unlink src
- end
- end
-
- def force_remove_file(path)
- begin
- remove_file path
- rescue
- end
- end
-
- def remove_file(path)
- File.chmod 0777, path
- File.unlink path
- end
-
- def install(from, dest, mode, prefix = nil)
- $stderr.puts "install #{from} #{dest}" if verbose?
- return if no_harm?
-
- realdest = prefix ? prefix + File.expand_path(dest) : dest
- realdest = File.join(realdest, File.basename(from)) if File.dir?(realdest)
- str = File.binread(from)
- if diff?(str, realdest)
- verbose_off {
- rm_f realdest if File.exist?(realdest)
- }
- File.open(realdest, 'wb') {|f|
- f.write str
- }
- File.chmod mode, realdest
-
- File.open("#{objdir_root()}/InstalledFiles", 'a') {|f|
- if prefix
- f.puts realdest.sub(prefix, '')
- else
- f.puts realdest
- end
- }
- end
- end
-
- def diff?(new_content, path)
- return true unless File.exist?(path)
- new_content != File.binread(path)
- end
-
- def command(*args)
- $stderr.puts args.join(' ') if verbose?
- system(*args) or raise RuntimeError,
- "system(#{args.map{|a| a.inspect }.join(' ')}) failed"
- end
-
- def ruby(*args)
- command config('rubyprog'), *args
- end
-
- def make(task = nil)
- command(*[config('makeprog'), task].compact)
- end
-
- def extdir?(dir)
- File.exist?("#{dir}/MANIFEST") or File.exist?("#{dir}/extconf.rb")
- end
-
- def files_of(dir)
- Dir.open(dir) {|d|
- return d.select {|ent| File.file?("#{dir}/#{ent}") }
- }
- end
-
- DIR_REJECT = %w( . .. CVS SCCS RCS CVS.adm .svn )
-
- def directories_of(dir)
- Dir.open(dir) {|d|
- return d.select {|ent| File.dir?("#{dir}/#{ent}") } - DIR_REJECT
- }
- end
-
-end
-
-
-# This module requires: #srcdir_root, #objdir_root, #relpath
-module HookScriptAPI
-
- def get_config(key)
- @config[key]
- end
-
- alias config get_config
-
- # obsolete: use metaconfig to change configuration
- def set_config(key, val)
- @config[key] = val
- end
-
- #
- # srcdir/objdir (works only in the package directory)
- #
-
- def curr_srcdir
- "#{srcdir_root()}/#{relpath()}"
- end
-
- def curr_objdir
- "#{objdir_root()}/#{relpath()}"
- end
-
- def srcfile(path)
- "#{curr_srcdir()}/#{path}"
- end
-
- def srcexist?(path)
- File.exist?(srcfile(path))
- end
-
- def srcdirectory?(path)
- File.dir?(srcfile(path))
- end
-
- def srcfile?(path)
- File.file?(srcfile(path))
- end
-
- def srcentries(path = '.')
- Dir.open("#{curr_srcdir()}/#{path}") {|d|
- return d.to_a - %w(. ..)
- }
- end
-
- def srcfiles(path = '.')
- srcentries(path).select {|fname|
- File.file?(File.join(curr_srcdir(), path, fname))
- }
- end
-
- def srcdirectories(path = '.')
- srcentries(path).select {|fname|
- File.dir?(File.join(curr_srcdir(), path, fname))
- }
- end
-
-end
-
-
-class ToplevelInstaller
-
- Version = '3.4.1'
- Copyright = 'Copyright (c) 2000-2005 Minero Aoki'
-
- TASKS = [
- [ 'all', 'do config, setup, then install' ],
- [ 'config', 'saves your configurations' ],
- [ 'show', 'shows current configuration' ],
- [ 'setup', 'compiles ruby extentions and others' ],
- [ 'install', 'installs files' ],
- [ 'test', 'run all tests in test/' ],
- [ 'clean', "does `make clean' for each extention" ],
- [ 'distclean',"does `make distclean' for each extention" ]
- ]
-
- def ToplevelInstaller.invoke
- config = ConfigTable.new(load_rbconfig())
- config.load_standard_entries
- config.load_multipackage_entries if multipackage?
- config.fixup
- klass = (multipackage?() ? ToplevelInstallerMulti : ToplevelInstaller)
- klass.new(File.dirname($0), config).invoke
- end
-
- def ToplevelInstaller.multipackage?
- File.dir?(File.dirname($0) + '/packages')
- end
-
- def ToplevelInstaller.load_rbconfig
- if arg = ARGV.detect {|arg| /\A--rbconfig=/ =~ arg }
- ARGV.delete(arg)
- load File.expand_path(arg.split(/=/, 2)[1])
- $".push 'rbconfig.rb'
- else
- require 'rbconfig'
- end
- ::Config::CONFIG
- end
-
- def initialize(ardir_root, config)
- @ardir = File.expand_path(ardir_root)
- @config = config
- # cache
- @valid_task_re = nil
- end
-
- def config(key)
- @config[key]
- end
-
- def inspect
- "#<#{self.class} #{__id__()}>"
- end
-
- def invoke
- run_metaconfigs
- case task = parsearg_global()
- when nil, 'all'
- parsearg_config
- init_installers
- exec_config
- exec_setup
- exec_install
- else
- case task
- when 'config', 'test'
- ;
- when 'clean', 'distclean'
- @config.load_savefile if File.exist?(@config.savefile)
- else
- @config.load_savefile
- end
- __send__ "parsearg_#{task}"
- init_installers
- __send__ "exec_#{task}"
- end
- end
-
- def run_metaconfigs
- @config.load_script "#{@ardir}/metaconfig"
- end
-
- def init_installers
- @installer = Installer.new(@config, @ardir, File.expand_path('.'))
- end
-
- #
- # Hook Script API bases
- #
-
- def srcdir_root
- @ardir
- end
-
- def objdir_root
- '.'
- end
-
- def relpath
- '.'
- end
-
- #
- # Option Parsing
- #
-
- def parsearg_global
- while arg = ARGV.shift
- case arg
- when /\A\w+\z/
- setup_rb_error "invalid task: #{arg}" unless valid_task?(arg)
- return arg
- when '-q', '--quiet'
- @config.verbose = false
- when '--verbose'
- @config.verbose = true
- when '--help'
- print_usage $stdout
- exit 0
- when '--version'
- puts "#{File.basename($0)} version #{Version}"
- exit 0
- when '--copyright'
- puts Copyright
- exit 0
- else
- setup_rb_error "unknown global option '#{arg}'"
- end
- end
- nil
- end
-
- def valid_task?(t)
- valid_task_re() =~ t
- end
-
- def valid_task_re
- @valid_task_re ||= /\A(?:#{TASKS.map {|task,desc| task }.join('|')})\z/
- end
-
- def parsearg_no_options
- unless ARGV.empty?
- task = caller(0).first.slice(%r<`parsearg_(\w+)'>, 1)
- setup_rb_error "#{task}: unknown options: #{ARGV.join(' ')}"
- end
- end
-
- alias parsearg_show parsearg_no_options
- alias parsearg_setup parsearg_no_options
- alias parsearg_test parsearg_no_options
- alias parsearg_clean parsearg_no_options
- alias parsearg_distclean parsearg_no_options
-
- def parsearg_config
- evalopt = []
- set = []
- @config.config_opt = []
- while i = ARGV.shift
- if /\A--?\z/ =~ i
- @config.config_opt = ARGV.dup
- break
- end
- name, value = *@config.parse_opt(i)
- if @config.value_config?(name)
- @config[name] = value
- else
- evalopt.push [name, value]
- end
- set.push name
- end
- evalopt.each do |name, value|
- @config.lookup(name).evaluate value, @config
- end
- # Check if configuration is valid
- set.each do |n|
- @config[n] if @config.value_config?(n)
- end
- end
-
- def parsearg_install
- @config.no_harm = false
- @config.install_prefix = ''
- while a = ARGV.shift
- case a
- when '--no-harm'
- @config.no_harm = true
- when /\A--prefix=/
- path = a.split(/=/, 2)[1]
- path = File.expand_path(path) unless path[0,1] == '/'
- @config.install_prefix = path
- else
- setup_rb_error "install: unknown option #{a}"
- end
- end
- end
-
- def print_usage(out)
- out.puts 'Typical Installation Procedure:'
- out.puts " $ ruby #{File.basename $0} config"
- out.puts " $ ruby #{File.basename $0} setup"
- out.puts " # ruby #{File.basename $0} install (may require root privilege)"
- out.puts
- out.puts 'Detailed Usage:'
- out.puts " ruby #{File.basename $0} "
- out.puts " ruby #{File.basename $0} [] []"
-
- fmt = " %-24s %s\n"
- out.puts
- out.puts 'Global options:'
- out.printf fmt, '-q,--quiet', 'suppress message outputs'
- out.printf fmt, ' --verbose', 'output messages verbosely'
- out.printf fmt, ' --help', 'print this message'
- out.printf fmt, ' --version', 'print version and quit'
- out.printf fmt, ' --copyright', 'print copyright and quit'
- out.puts
- out.puts 'Tasks:'
- TASKS.each do |name, desc|
- out.printf fmt, name, desc
- end
-
- fmt = " %-24s %s [%s]\n"
- out.puts
- out.puts 'Options for CONFIG or ALL:'
- @config.each do |item|
- out.printf fmt, item.help_opt, item.description, item.help_default
- end
- out.printf fmt, '--rbconfig=path', 'rbconfig.rb to load',"running ruby's"
- out.puts
- out.puts 'Options for INSTALL:'
- out.printf fmt, '--no-harm', 'only display what to do if given', 'off'
- out.printf fmt, '--prefix=path', 'install path prefix', ''
- out.puts
- end
-
- #
- # Task Handlers
- #
-
- def exec_config
- @installer.exec_config
- @config.save # must be final
- end
-
- def exec_setup
- @installer.exec_setup
- end
-
- def exec_install
- @installer.exec_install
- end
-
- def exec_test
- @installer.exec_test
- end
-
- def exec_show
- @config.each do |i|
- printf "%-20s %s\n", i.name, i.value if i.value?
- end
- end
-
- def exec_clean
- @installer.exec_clean
- end
-
- def exec_distclean
- @installer.exec_distclean
- end
-
-end # class ToplevelInstaller
-
-
-class ToplevelInstallerMulti < ToplevelInstaller
-
- include FileOperations
-
- def initialize(ardir_root, config)
- super
- @packages = directories_of("#{@ardir}/packages")
- raise 'no package exists' if @packages.empty?
- @root_installer = Installer.new(@config, @ardir, File.expand_path('.'))
- end
-
- def run_metaconfigs
- @config.load_script "#{@ardir}/metaconfig", self
- @packages.each do |name|
- @config.load_script "#{@ardir}/packages/#{name}/metaconfig"
- end
- end
-
- attr_reader :packages
-
- def packages=(list)
- raise 'package list is empty' if list.empty?
- list.each do |name|
- raise "directory packages/#{name} does not exist"\
- unless File.dir?("#{@ardir}/packages/#{name}")
- end
- @packages = list
- end
-
- def init_installers
- @installers = {}
- @packages.each do |pack|
- @installers[pack] = Installer.new(@config,
- "#{@ardir}/packages/#{pack}",
- "packages/#{pack}")
- end
- with = extract_selection(config('with'))
- without = extract_selection(config('without'))
- @selected = @installers.keys.select {|name|
- (with.empty? or with.include?(name)) \
- and not without.include?(name)
- }
- end
-
- def extract_selection(list)
- a = list.split(/,/)
- a.each do |name|
- setup_rb_error "no such package: #{name}" unless @installers.key?(name)
- end
- a
- end
-
- def print_usage(f)
- super
- f.puts 'Inluded packages:'
- f.puts ' ' + @packages.sort.join(' ')
- f.puts
- end
-
- #
- # Task Handlers
- #
-
- def exec_config
- run_hook 'pre-config'
- each_selected_installers {|inst| inst.exec_config }
- run_hook 'post-config'
- @config.save # must be final
- end
-
- def exec_setup
- run_hook 'pre-setup'
- each_selected_installers {|inst| inst.exec_setup }
- run_hook 'post-setup'
- end
-
- def exec_install
- run_hook 'pre-install'
- each_selected_installers {|inst| inst.exec_install }
- run_hook 'post-install'
- end
-
- def exec_test
- run_hook 'pre-test'
- each_selected_installers {|inst| inst.exec_test }
- run_hook 'post-test'
- end
-
- def exec_clean
- rm_f @config.savefile
- run_hook 'pre-clean'
- each_selected_installers {|inst| inst.exec_clean }
- run_hook 'post-clean'
- end
-
- def exec_distclean
- rm_f @config.savefile
- run_hook 'pre-distclean'
- each_selected_installers {|inst| inst.exec_distclean }
- run_hook 'post-distclean'
- end
-
- #
- # lib
- #
-
- def each_selected_installers
- Dir.mkdir 'packages' unless File.dir?('packages')
- @selected.each do |pack|
- $stderr.puts "Processing the package `#{pack}' ..." if verbose?
- Dir.mkdir "packages/#{pack}" unless File.dir?("packages/#{pack}")
- Dir.chdir "packages/#{pack}"
- yield @installers[pack]
- Dir.chdir '../..'
- end
- end
-
- def run_hook(id)
- @root_installer.run_hook id
- end
-
- # module FileOperations requires this
- def verbose?
- @config.verbose?
- end
-
- # module FileOperations requires this
- def no_harm?
- @config.no_harm?
- end
-
-end # class ToplevelInstallerMulti
-
-
-class Installer
-
- FILETYPES = %w( bin lib ext data conf man )
-
- include FileOperations
- include HookScriptAPI
-
- def initialize(config, srcroot, objroot)
- @config = config
- @srcdir = File.expand_path(srcroot)
- @objdir = File.expand_path(objroot)
- @currdir = '.'
- end
-
- def inspect
- "#<#{self.class} #{File.basename(@srcdir)}>"
- end
-
- def noop(rel)
- end
-
- #
- # Hook Script API base methods
- #
-
- def srcdir_root
- @srcdir
- end
-
- def objdir_root
- @objdir
- end
-
- def relpath
- @currdir
- end
-
- #
- # Config Access
- #
-
- # module FileOperations requires this
- def verbose?
- @config.verbose?
- end
-
- # module FileOperations requires this
- def no_harm?
- @config.no_harm?
- end
-
- def verbose_off
- begin
- save, @config.verbose = @config.verbose?, false
- yield
- ensure
- @config.verbose = save
- end
- end
-
- #
- # TASK config
- #
-
- def exec_config
- exec_task_traverse 'config'
- end
-
- alias config_dir_bin noop
- alias config_dir_lib noop
-
- def config_dir_ext(rel)
- extconf if extdir?(curr_srcdir())
- end
-
- alias config_dir_data noop
- alias config_dir_conf noop
- alias config_dir_man noop
-
- def extconf
- ruby "#{curr_srcdir()}/extconf.rb", *@config.config_opt
- end
-
- #
- # TASK setup
- #
-
- def exec_setup
- exec_task_traverse 'setup'
- end
-
- def setup_dir_bin(rel)
- files_of(curr_srcdir()).each do |fname|
- update_shebang_line "#{curr_srcdir()}/#{fname}"
- end
- end
-
- alias setup_dir_lib noop
-
- def setup_dir_ext(rel)
- make if extdir?(curr_srcdir())
- end
-
- alias setup_dir_data noop
- alias setup_dir_conf noop
- alias setup_dir_man noop
-
- def update_shebang_line(path)
- return if no_harm?
- return if config('shebang') == 'never'
- old = Shebang.load(path)
- if old
- $stderr.puts "warning: #{path}: Shebang line includes too many args. It is not portable and your program may not work." if old.args.size > 1
- new = new_shebang(old)
- return if new.to_s == old.to_s
- else
- return unless config('shebang') == 'all'
- new = Shebang.new(config('rubypath'))
- end
- $stderr.puts "updating shebang: #{File.basename(path)}" if verbose?
- open_atomic_writer(path) {|output|
- File.open(path, 'rb') {|f|
- f.gets if old # discard
- output.puts new.to_s
- output.print f.read
- }
- }
- end
-
- def new_shebang(old)
- if /\Aruby/ =~ File.basename(old.cmd)
- Shebang.new(config('rubypath'), old.args)
- elsif File.basename(old.cmd) == 'env' and old.args.first == 'ruby'
- Shebang.new(config('rubypath'), old.args[1..-1])
- else
- return old unless config('shebang') == 'all'
- Shebang.new(config('rubypath'))
- end
- end
-
- def open_atomic_writer(path, &block)
- tmpfile = File.basename(path) + '.tmp'
- begin
- File.open(tmpfile, 'wb', &block)
- File.rename tmpfile, File.basename(path)
- ensure
- File.unlink tmpfile if File.exist?(tmpfile)
- end
- end
-
- class Shebang
- def Shebang.load(path)
- line = nil
- File.open(path) {|f|
- line = f.gets
- }
- return nil unless /\A#!/ =~ line
- parse(line)
- end
-
- def Shebang.parse(line)
- cmd, *args = *line.strip.sub(/\A\#!/, '').split(' ')
- new(cmd, args)
- end
-
- def initialize(cmd, args = [])
- @cmd = cmd
- @args = args
- end
-
- attr_reader :cmd
- attr_reader :args
-
- def to_s
- "#! #{@cmd}" + (@args.empty? ? '' : " #{@args.join(' ')}")
- end
- end
-
- #
- # TASK install
- #
-
- def exec_install
- rm_f 'InstalledFiles'
- exec_task_traverse 'install'
- end
-
- def install_dir_bin(rel)
- install_files targetfiles(), "#{config('bindir')}/#{rel}", 0755
- end
-
- def install_dir_lib(rel)
- install_files libfiles(), "#{config('rbdir')}/#{rel}", 0644
- end
-
- def install_dir_ext(rel)
- return unless extdir?(curr_srcdir())
- install_files rubyextentions('.'),
- "#{config('sodir')}/#{File.dirname(rel)}",
- 0555
- end
-
- def install_dir_data(rel)
- install_files targetfiles(), "#{config('datadir')}/#{rel}", 0644
- end
-
- def install_dir_conf(rel)
- # FIXME: should not remove current config files
- # (rename previous file to .old/.org)
- install_files targetfiles(), "#{config('sysconfdir')}/#{rel}", 0644
- end
-
- def install_dir_man(rel)
- install_files targetfiles(), "#{config('mandir')}/#{rel}", 0644
- end
-
- def install_files(list, dest, mode)
- mkdir_p dest, @config.install_prefix
- list.each do |fname|
- install fname, dest, mode, @config.install_prefix
- end
- end
-
- def libfiles
- glob_reject(%w(*.y *.output), targetfiles())
- end
-
- def rubyextentions(dir)
- ents = glob_select("*.#{@config.dllext}", targetfiles())
- if ents.empty?
- setup_rb_error "no ruby extention exists: 'ruby #{$0} setup' first"
- end
- ents
- end
-
- def targetfiles
- mapdir(existfiles() - hookfiles())
- end
-
- def mapdir(ents)
- ents.map {|ent|
- if File.exist?(ent)
- then ent # objdir
- else "#{curr_srcdir()}/#{ent}" # srcdir
- end
- }
- end
-
- # picked up many entries from cvs-1.11.1/src/ignore.c
- JUNK_FILES = %w(
- core RCSLOG tags TAGS .make.state
- .nse_depinfo #* .#* cvslog.* ,* .del-* *.olb
- *~ *.old *.bak *.BAK *.orig *.rej _$* *$
-
- *.org *.in .*
- )
-
- def existfiles
- glob_reject(JUNK_FILES, (files_of(curr_srcdir()) | files_of('.')))
- end
-
- def hookfiles
- %w( pre-%s post-%s pre-%s.rb post-%s.rb ).map {|fmt|
- %w( config setup install clean ).map {|t| sprintf(fmt, t) }
- }.flatten
- end
-
- def glob_select(pat, ents)
- re = globs2re([pat])
- ents.select {|ent| re =~ ent }
- end
-
- def glob_reject(pats, ents)
- re = globs2re(pats)
- ents.reject {|ent| re =~ ent }
- end
-
- GLOB2REGEX = {
- '.' => '\.',
- '$' => '\$',
- '#' => '\#',
- '*' => '.*'
- }
-
- def globs2re(pats)
- /\A(?:#{
- pats.map {|pat| pat.gsub(/[\.\$\#\*]/) {|ch| GLOB2REGEX[ch] } }.join('|')
- })\z/
- end
-
- #
- # TASK test
- #
-
- TESTDIR = 'test'
-
- def exec_test
- unless File.directory?('test')
- $stderr.puts 'no test in this package' if verbose?
- return
- end
- $stderr.puts 'Running tests...' if verbose?
- begin
- require 'test/unit'
- rescue LoadError
- setup_rb_error 'test/unit cannot loaded. You need Ruby 1.8 or later to invoke this task.'
- end
- runner = Test::Unit::AutoRunner.new(true)
- runner.to_run << TESTDIR
- runner.run
- end
-
- #
- # TASK clean
- #
-
- def exec_clean
- exec_task_traverse 'clean'
- rm_f @config.savefile
- rm_f 'InstalledFiles'
- end
-
- alias clean_dir_bin noop
- alias clean_dir_lib noop
- alias clean_dir_data noop
- alias clean_dir_conf noop
- alias clean_dir_man noop
-
- def clean_dir_ext(rel)
- return unless extdir?(curr_srcdir())
- make 'clean' if File.file?('Makefile')
- end
-
- #
- # TASK distclean
- #
-
- def exec_distclean
- exec_task_traverse 'distclean'
- rm_f @config.savefile
- rm_f 'InstalledFiles'
- end
-
- alias distclean_dir_bin noop
- alias distclean_dir_lib noop
-
- def distclean_dir_ext(rel)
- return unless extdir?(curr_srcdir())
- make 'distclean' if File.file?('Makefile')
- end
-
- alias distclean_dir_data noop
- alias distclean_dir_conf noop
- alias distclean_dir_man noop
-
- #
- # Traversing
- #
-
- def exec_task_traverse(task)
- run_hook "pre-#{task}"
- FILETYPES.each do |type|
- if type == 'ext' and config('without-ext') == 'yes'
- $stderr.puts 'skipping ext/* by user option' if verbose?
- next
- end
- traverse task, type, "#{task}_dir_#{type}"
- end
- run_hook "post-#{task}"
- end
-
- def traverse(task, rel, mid)
- dive_into(rel) {
- run_hook "pre-#{task}"
- __send__ mid, rel.sub(%r[\A.*?(?:/|\z)], '')
- directories_of(curr_srcdir()).each do |d|
- traverse task, "#{rel}/#{d}", mid
- end
- run_hook "post-#{task}"
- }
- end
-
- def dive_into(rel)
- return unless File.dir?("#{@srcdir}/#{rel}")
-
- dir = File.basename(rel)
- Dir.mkdir dir unless File.dir?(dir)
- prevdir = Dir.pwd
- Dir.chdir dir
- $stderr.puts '---> ' + rel if verbose?
- @currdir = rel
- yield
- Dir.chdir prevdir
- $stderr.puts '<--- ' + rel if verbose?
- @currdir = File.dirname(rel)
- end
-
- def run_hook(id)
- path = [ "#{curr_srcdir()}/#{id}",
- "#{curr_srcdir()}/#{id}.rb" ].detect {|cand| File.file?(cand) }
- return unless path
- begin
- instance_eval File.read(path), path, 1
- rescue
- raise if $DEBUG
- setup_rb_error "hook #{path} failed:\n" + $!.message
- end
- end
-
-end # class Installer
-
-
-class SetupError < StandardError; end
-
-def setup_rb_error(msg)
- raise SetupError, msg
-end
-
-if $0 == __FILE__
- begin
- ToplevelInstaller.invoke
- rescue SetupError
- raise if $DEBUG
- $stderr.puts $!.message
- $stderr.puts "Try 'ruby #{$0} --help' for detailed usage."
- exit 1
- end
-end
-
diff --git a/utils/tests/test.tex b/utils/tests/test.tex
deleted file mode 100644
index 37a19e8..0000000
--- a/utils/tests/test.tex
+++ /dev/null
@@ -1,24 +0,0 @@
-% Time-stamp: <2004/04/06, 16:46:43 (EST), maverick, test.tex>
-\subsection{Strict diagonal-dominance}
-Suppose we are given a matrix $A=L+D$, where $L$ is a Laplacian and
-$D$ is a nonnegative diagonal matrix, for which we seek to construct a
-preconditioner.
-
-We may construct a Support Tree Preconditioner, $B =
-\begin{pmatrix} T & U\\U\TT & W\end{pmatrix}$ for $L$ and to use $B'
-=\begin{pmatrix} T & U \\U\TT & W+D\end{pmatrix}$ as a preconditioner
-for $A$. If we let $Q = W - U\TT T\IV U$, by Lemma~\ref{lem:stcg} it
-suffices to bound $\sigma(A/Q+D)$ and $\sigma(Q+D/A)$.
-
-\begin{proposition}\label{prop:XZ-YZ}
-If $X$, $Y$, and $Z$ are spsd matrices of the same size then
-$\sigma(X+Z/Y+Z) \leq \max\{\sigma(X/Y),\, 1\}$.
-\end{proposition}
-
-\Proof We have $\sigma(X+Z/Y+Z) =
-\min\{\tau \mid \forall\vv{x},\, \tau\cdot \vv{x}\TT (Y+Z)\vv{x} \geq
- \vv{x}\TT(X+Z)\vv{x}\} =
-\min\{\tau \mid \forall\vv{x},\, (\tau-1)\cdot \vv{x}\TT Z\vv{x} +
- \tau \cdot\vv{x}\TT Y\vv{x} \geq \vv{x}\TT X\vv{x}\} \leq
-\max\{1,\,\sigma(X/Y)\}$.\QED
-
diff --git a/utils/vimorg-text b/utils/vimorg-text
deleted file mode 100644
index 9197f74..0000000
--- a/utils/vimorg-text
+++ /dev/null
@@ -1,28 +0,0 @@
-Solarized
-=========
-
-summary
--------
-
-Beautiful dual light/dark, selective contrast, GUI/256/16 colorscheme
-
-detailed description
---------------------
-
-Screenshots and details at http://ethanschoonover.com/solarized (includes Solarized for other applications including mutt, terminal emulators).
-
-Can also be cloned from github at https://github.com/altercation/vim-colors-solarized for use with Pathogen, Vundle, etc.
-
-* * *
-
-Solarized is a beautiful, carefully designed 16 color, selective contrast colorscheme with both *light* and *dark* modes. It supports GUI full color, 256 color terminal mode and 16 color terminal mode (use Solarized terminal colorschemes with the latter for optimal results; see project homepage above).
-
-It has been built on a foundation of eight monotones with precise CIELAB lightness relations. These monotones relations are symmetric, allowing for use in light and dark modes with identical readability.
-
-Install details
----------------
-
-See the README in the script download for installation details and utility scripts for your .vimrc.
-
-For the impatient without customized vim setups: drop solarized.vim into your ~/.vim/colors directory.
-
diff --git a/vim-colors-solarized/README.md b/vim-colors-solarized/README.md
deleted file mode 100644
index 45e5196..0000000
--- a/vim-colors-solarized/README.md
+++ /dev/null
@@ -1,259 +0,0 @@
-Solarized Colorscheme for Vim
-=============================
-
-Developed by Ethan Schoonover
-
-Visit the [Solarized Homepage][solarized]
------------------------------------------
-
-See the [homepage for the Solarized colorscheme][solarized] for screenshots,
-details and colorscheme versions for Vim, Mutt, popular terminal emulators and
-other applications.
-
-Screenshots
------------
-
-[![solarized
-dark](https://github.com/altercation/solarized/raw/master/img/solarized-screen-ruby-dark-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-ruby-dark.png)
-[![solarized light](https://github.com/altercation/solarized/raw/master/img/solarized-screen-ruby-light-th.png)](https://github.com/altercation/solarized/raw/master/img/solarized-screen-ruby-light.png)
-
-Downloads
----------
-
-If you have come across this colorscheme via the [vim-only repository on
-github][vim-solarized-github], or the [vim.org script page][vimorg-script] see
-the link above to the Solarized homepage or
-visit the [github repository for Solarized][solarized-github].
-
-[solarized]: http://ethanschoonover.com/solarized
-[solarized-github]: https://github.com/altercation/solarized
-[vim-solarized-github]: https://github.com/altercation/vim-colors-solarized
-[vimorg-script]: http://vim.org/script
-[pathogen]: https://github.com/tpope/vim-pathogen
-
-Installation
-------------
-
-### Option 1: Manual installation
-
-1. Move `solarized.vim` to your `.vim/colors` directory. After downloading the
- vim script or package:
-
- $ cd vim-colors-solarized/colors
- $ mv solarized.vim ~/.vim/colors/
-
-### Option 2: Pathogen installation ***(recommended)***
-
-1. Download and install Tim Pope's [Pathogen].
-
-2. Next, move or clone the `vim-colors-solarized` directory so that it is
- a subdirectory of the `.vim/bundle` directory.
-
- a. **Clone:**
-
- $ cd ~/.vim/bundle
- $ git clone git://github.com/altercation/vim-colors-solarized.git
-
- b. **Move:**
-
- In the parent directory of vim-colors-solarized:
-
- $ mv vim-colors-solarized ~/.vim/bundle/
-
-### Modify .vimrc
-
-After either Option 1 or Option 2 above, put the following two lines in your
-.vimrc:
-
- set background=dark
- colorscheme solarized
-
-or, for the light background mode of Solarized:
-
- set background=light
- colorscheme solarized
-
-I like to have a different background in GUI and terminal modes, so I can use
-the following if-then. However, I find vim's background autodetection to be
-pretty good and, at least with MacVim, I can leave this background value
-assignment out entirely and get the same results.
-
- if has('gui_running')
- set background=light
- else
- set background=dark
- endif
-
-See the [Solarized homepage][solarized] for screenshots which will help you
-select either the light or dark background.
-
-### IMPORTANT NOTE FOR TERMINAL USERS:
-
-If you are going to use Solarized in Terminal mode (i.e. not in a GUI version
-like gvim or macvim), **please please please** consider setting your terminal
-emulator's colorscheme to used the Solarized palette. I've included palettes
-for some popular terminal emulator as well as Xdefaults in the official
-Solarized download available from [Solarized homepage][solarized]. If you use
-Solarized without these colors, Solarized will by default use an approximate
-set of 256 colors. It isn't bad looking and has been extensively tweaked, but
-it's still not quite the real thing.
-
-If you do use the custom terminal colors, simply add the following line
-*before* the `colorschem solarized` line:
-
- let g:solarized_termcolors=16
-
-Advanced Configuration
-----------------------
-
-Solarized will work out of the box with just the two lines specified above but
-does include several other options that can be set in your .vimrc file.
-
-Set these in your vimrc file prior to calling the colorscheme.
-"
- option name default optional
- ------------------------------------------------
- g:solarized_termcolors= 256 | 16
- g:solarized_termtrans = 0 | 1
- g:solarized_degrade = 0 | 1
- g:solarized_bold = 1 | 0
- g:solarized_underline = 1 | 0
- g:solarized_italic = 1 | 0
- g:solarized_style = "dark" | "light"
- g:solarized_contrast = "normal"| "high" or "low"
- ------------------------------------------------
-
-### Option Details
-
-* g:solarized_termcolors
-
- **The most important option** if you are using vim in terminal (non gui)
- mode! See my diatribe above regarding terminal colors. This tells Solarized
- to use the 256 degraded color mode if running in a 256 color capable
- terminal. Otherwise, if set to `16` it will use the terminal emulators
- colorscheme (best option as long as you've set the emulators colors to the
- Solarized palette).
-
-* g:solarized_termtrans
-
- If you use a terminal emulator with a transparent background and Solarized
- isn't displaying the background color transparently, set this to 1 and
- Solarized will use the default (transparent) background of the terminal
- emulator. *urxvt* required this in my testing; Terminal.app/iTerm2 did not.
-
-* g:solarized_degrade
-
- For test purposes only; forces Solarized to use the 256 degraded color mode
- to test the approximate color values for accuracy.
-
-* g:solarized_bold | g:solarized_underline | g:solarized_italic
-
- If you wish to stop Solarized from displaying bold, underlined or
- italicized typefaces, simply assign a zero value to the appropriate
- variable, for example: `let g:solarized_italic=0`
-
-* g:solarized_style
-
- Simply another way to force Solarized to use a dark or light background.
- It's better to use `set background=dark` or `set background=light` in your
- .vimrc file. This option is mostly used in scripts (quick background color
- change) or for testing.
-
-* g:solarized_contrast
-
- Stick with normal! It's been carefully tested. Setting this option to high
- or low does use the same Solarized palette but simply shifts some values up
- or down in order to expand or compress the tonal range displayed.
-
-### **IMPORTANT NOTE FOR TERMINAL USERS**
-
-If you are running vim in a terminal, Solarized will run in 256 color mode if
-the terminal supports it, but those 256 colors are (in all 256 color terminal
-emulators) limited to a "degraded" color palette. While the colors will all
-approximate the specific Solarized color values, if you prefer an accurate
-color palette you can set the ANSI colors in your terminal and use the 16 color
-terminal mode using the g:solarized_termcolors="16" option detailed below. The
-ANSI color map is specified in the table below and terminal color themes are
-available for download from the web page listed at the top of this file,
-including xorg defaul color values and themes for OS X Terminal.app and iTerm2.
-
-Toggle Background Function
---------------------------
-
-Here's a quick script that toggles the background color, using F5 in this
-example. You can drop this into .vimrc:
-
- function! ToggleBackground()
- if (w:solarized_style=="dark")
- let w:solarized_style="light"
- colorscheme solarized
- else
- let w:solarized_style="dark"
- colorscheme solarized
- endif
- endfunction
- command! Togbg call ToggleBackground()
- nnoremap :call ToggleBackground()
- inoremap :call ToggleBackground()a
- vnoremap :call ToggleBackground()
-
-Code Notes
-----------
-
-Use folding to view the `solarized.vim` script with `foldmethod=marker` turned
-on.
-
-I have attempted to modularize the creation of Vim colorschemes in this script
-and, while it could be refactored further, it should be a good foundation for
-the creation of any color scheme. By simply changing the sixteen values in the
-GUI section and testing in gvim (or mvim) you can rapidly prototype new
-colorschemes without diving into the weeds of line-item editing each syntax
-highlight declaration.
-
-The Values
-----------
-
-L\*a\*b values are canonical (White D65, Reference D50), other values are
-matched in sRGB space.
-
- SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B sRGB HSB
- --------- ------- ---- ------- ----------- ---------- ----------- -----------
- base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21
- base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26
- base01 #586e75 10/7 brgreen 240 #4e4e4e 45 -07 -07 88 110 117 194 25 46
- base00 #657b83 11/7 bryellow 241 #585858 50 -07 -07 101 123 131 195 23 51
- base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59
- base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63
- base2 #eee8d5 7/7 white 254 #d7d7af 92 -00 10 238 232 213 44 11 93
- base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99
- yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71
- orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80
- red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86
- magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83
- violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77
- blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82
- cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63
- green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60
-
-License
--------
-Copyright (c) 2011 Ethan Schoonover
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
diff --git a/vim-colors-solarized/colors/solarized.vim b/vim-colors-solarized/colors/solarized.vim
deleted file mode 100644
index 81c2c99..0000000
--- a/vim-colors-solarized/colors/solarized.vim
+++ /dev/null
@@ -1,964 +0,0 @@
-" Name: Solarized vim colorscheme
-" Author: Ethan Schoonover
-" URL: http://ethanschoonover.com/solarized
-" (see this url for latest release & screenshots)
-" License: OSI approved MIT license (see end of this file)
-"
-" Usage "{{{
-"
-" ---------------------------------------------------------------------
-" ABOUT:
-" ---------------------------------------------------------------------
-" Solarized is a carefully designed selective contrast colorscheme with dual
-" light and dark modes that runs in both GUI, 256 and 16 color modes.
-"
-" See the homepage above for screenshots and details.
-"
-" ---------------------------------------------------------------------
-" INSTALLATION:
-" ---------------------------------------------------------------------
-"
-" Two options for installation: manual or pathogen
-"
-" MANUAL INSTALLATION OPTION:
-" ---------------------------------------------------------------------
-"
-" 1. Put the files in the right place!
-" 2. Move `solarized.vim` to your `.vim/colors` directory.
-"
-" RECOMMENDED PATHOGEN INSTALLATION OPTION:
-" ---------------------------------------------------------------------
-"
-" 1. Download and install Tim Pope's Pathogen from:
-" https://github.com/tpope/vim-pathogen
-"
-" 2. Next, move or clone the `vim-colors-solarized` directory so that it is
-" a subdirectory of the `.vim/bundle` directory.
-"
-" a. **clone with git:**
-"
-" $ cd ~/.vim/bundle
-" $ git clone git://github.com/altercation/vim-colors-solarized.git
-"
-" b. **or move manually into the pathogen bundle directory:**
-" In the parent directory of vim-colors-solarized:
-"
-" $ mv vim-colors-solarized ~/.vim/bundle/
-"
-" MODIFY VIMRC:
-"
-" After either Option 1 or Option 2 above, put the following two lines in your
-" .vimrc:
-"
-" set background=dark
-" colorscheme solarized
-"
-" or, for the light background mode of Solarized:
-"
-" set background=light
-" colorscheme solarized
-"
-" I like to have a different background in GUI and terminal modes, so I can use
-" the following if-then. However, I find vim's background autodetection to be
-" pretty good and, at least with MacVim, I can leave this background value
-" assignment out entirely and get the same results.
-"
-" if has('gui_running')
-" set background=light
-" else
-" set background=dark
-" endif
-"
-" See the Solarized homepage at http://ethanschoonover.com/solarized for
-" screenshots which will help you select either the light or dark background.
-"
-" Other options are detailed below.
-"
-" IMPORTANT NOTE FOR TERMINAL USERS:
-"
-" If you are going to use Solarized in Terminal mode (i.e. not in a GUI
-" version like gvim or macvim), **please please please** consider setting your
-" terminal emulator's colorscheme to used the Solarized palette. I've included
-" palettes for some popular terminal emulator as well as Xdefaults in the
-" official Solarized download available from:
-"
-" http://ethanschoonover.com/solarized
-"
-" If you use Solarized without these colors, Solarized will by default use an
-" approximate set of 256 colors. It isn't bad looking and has been extensively
-" tweaked, but it's still not quite the real thing.
-"
-" If you do use the custom terminal colors, simply add the following line
-" *before* the `colorschem solarized` line:
-"
-" let g:solarized_termcolors=16
-"
-" ---------------------------------------------------------------------
-" TOGGLE BACKGROUND FUNCTION
-" ---------------------------------------------------------------------
-" Here's a quick script that toggles the background color, using F5 in this
-" example. You can drop this into .vimrc:
-"
-" function! ToggleBackground()
-" if (g:solarized_style=="dark")
-" let g:solarized_style="light"
-" colorscheme solarized
-" else
-" let g:solarized_style="dark"
-" colorscheme solarized
-" endif
-" endfunction
-" command! Togbg call ToggleBackground()
-" nnoremap :call ToggleBackground()
-" inoremap :call ToggleBackground()a
-" vnoremap :call ToggleBackground()
-"
-" ---------------------------------------------------------------------
-" OPTIONS
-" ---------------------------------------------------------------------
-"
-" Set these in your vimrc file prior to calling the colorscheme.
-"
-" option name default optional
-" ------------------------------------------------
-" g:solarized_termcolors= 256 | 16
-" g:solarized_termtrans = 0 | 1
-" g:solarized_degrade = 0 | 1
-" g:solarized_bold = 1 | 0
-" g:solarized_underline = 1 | 0
-" g:solarized_italic = 1 | 0
-" g:solarized_style = "dark" | "light"
-" g:solarized_contrast = "normal"| "high" or "low"
-" ------------------------------------------------
-"
-" OPTION DETAILS
-"
-" ------------------------------------------------
-" g:solarized_termcolors= 256 | 16
-" ------------------------------------------------
-" The most important option if you are using vim in terminal (non gui) mode!
-" This tells Solarized to use the 256 degraded color mode if running in a 256
-" color capable terminal. Otherwise, if set to `16` it will use the terminal
-" emulators colorscheme (best option as long as you've set the emulators colors
-" to the Solarized palette).
-"
-" If you are going to use Solarized in Terminal mode (i.e. not in a GUI
-" version like gvim or macvim), **please please please** consider setting your
-" terminal emulator's colorscheme to used the Solarized palette. I've included
-" palettes for some popular terminal emulator as well as Xdefaults in the
-" official Solarized download available from:
-" http://ethanschoonover.com/solarized . If you use Solarized without these
-" colors, Solarized will by default use an approximate set of 256 colors. It
-" isn't bad looking and has been extensively tweaked, but it's still not quite
-" the real thing.
-"
-" ------------------------------------------------
-" g:solarized_termtrans = 0 | 1
-" ------------------------------------------------
-" If you use a terminal emulator with a transparent background and Solarized
-" isn't displaying the background color transparently, set this to 1 and
-" Solarized will use the default (transparent) background of the terminal
-" emulator. *urxvt* required this in my testing; Terminal.app/iTerm2 did not.
-"
-" ------------------------------------------------
-" g:solarized_degrade = 0 | 1
-" ------------------------------------------------
-" For test purposes only; forces Solarized to use the 256 degraded color mode
-" to test the approximate color values for accuracy.
-"
-" ------------------------------------------------
-" g:solarized_bold = 1 | 0
-" ------------------------------------------------
-" ------------------------------------------------
-" g:solarized_underline = 1 | 0
-" ------------------------------------------------
-" ------------------------------------------------
-" g:solarized_italic = 1 | 0
-" ------------------------------------------------
-" If you wish to stop Solarized from displaying bold, underlined or
-" italicized typefaces, simply assign a zero value to the appropriate
-" variable, for example: `let g:solarized_italic=0`
-"
-" ------------------------------------------------
-" g:solarized_style = "dark" | "light"
-" ------------------------------------------------
-" Simply another way to force Solarized to use a dark or light background.
-" It's better to use `set background=dark` or `set background=light` in your
-" .vimrc file. This option is mostly used in scripts (quick background color
-" change) or for testing. Note that, if set, g:solarized_style overrides the
-" setting for "background".
-"
-" ------------------------------------------------
-" g:solarized_contrast = "normal"| "high" or "low"
-" ------------------------------------------------
-" Stick with normal! It's been carefully tested. Setting this option to high
-" or low does use the same Solarized palette but simply shifts some values up
-" or down in order to expand or compress the tonal range displayed.
-"
-" ---------------------------------------------------------------------
-" COLOR VALUES
-" ---------------------------------------------------------------------
-" Download palettes and files from: http://ethanschoonover.com/solarized
-"
-" L\*a\*b values are canonical (White D65, Reference D50), other values are
-" matched in sRGB space.
-"
-" SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B sRGB HSB
-" --------- ------- ---- ------- ----------- ---------- ----------- -----------
-" base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21
-" base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26
-" base01 #586e75 10/7 brgreen 240 #4e4e4e 45 -07 -07 88 110 117 194 25 46
-" base00 #657b83 11/7 bryellow 241 #585858 50 -07 -07 101 123 131 195 23 51
-" base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59
-" base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63
-" base2 #eee8d5 7/7 white 254 #d7d7af 92 -00 10 238 232 213 44 11 93
-" base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99
-" yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71
-" orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80
-" red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86
-" magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83
-" violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77
-" blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82
-" cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63
-" green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60
-"
-" ---------------------------------------------------------------------
-" COLORSCHEME HACKING
-" ---------------------------------------------------------------------
-"
-" Useful commands for testing colorschemes:
-" :source $VIMRUNTIME/syntax/hitest.vim
-" :help highlight-groups
-" :help cterm-colors
-" :help group-name
-"
-" Useful links for developing colorschemes:
-" http://www.vim.org/scripts/script.php?script_id=2937
-" http://vimcasts.org/episodes/creating-colorschemes-for-vim/
-" http://www.frexx.de/xterm-256-notes/"
-"
-"
-" }}}
-" Default option values"{{{
-" ---------------------------------------------------------------------
-if !exists("g:solarized_termtrans")
- let g:solarized_termtrans = 0
-endif
-if !exists("g:solarized_degrade")
- let g:solarized_degrade = 0
-endif
-if !exists("g:solarized_bold")
- let g:solarized_bold = 1
-endif
-if !exists("g:solarized_underline")
- let g:solarized_underline = 1
-endif
-if !exists("g:solarized_italic")
- let g:solarized_italic = 1
-endif
-if !exists("g:solarized_termcolors")
- let g:solarized_termcolors = 256
-endif
-if !exists("g:solarized_style") && !exists("g:solarized_style")
- let g:solarized_style = &background
-endif
-if !exists("g:solarized_contrast")
- let g:solarized_contrast = "normal"
-endif
-"}}}
-" Colorscheme basic settings"{{{
-" ---------------------------------------------------------------------
-if g:solarized_style == "dark"
- set background=dark
-elseif g:solarized_style == "light"
- set background=light
-else
- let g:solarized_style = &background
-endif
-
-hi clear
-if exists("syntax_on")
- syntax reset
-endif
-
-let colors_name = "solarized"
-"let colors_name = &background
-"if background == "light"
-" let colors_name = &background
-"else
-" let colors_name = &background
-"endif
-"}}}
-" GUI & CSApprox hexadecimal palettes"{{{
-" ---------------------------------------------------------------------
-"
-" Set both gui and terminal color values in separate conditional statements
-" Due to possibility that CSApprox is running (though I suppose we could just
-" leave the hex values out entirely in that case and include only cterm colors)
-" We also check to see if user has set solarized (force use of the
-" neutral gray monotone palette component)
-if has("gui_running") && g:solarized_degrade == 0
- let s:g_back = "#002b36"
- let s:g_base03 = "#002b36"
- let s:g_base02 = "#073642"
- let s:g_base01 = "#586e75"
- let s:g_base00 = "#657b83"
- let s:g_base0 = "#839496"
- let s:g_base1 = "#93a1a1"
- let s:g_base2 = "#eee8d5"
- let s:g_base3 = "#fdf6e3"
- let s:g_yellow = "#b58900"
- let s:g_orange = "#cb4b16"
- let s:g_red = "#dc322f"
- let s:g_magenta = "#d33682"
- let s:g_violet = "#6c71c4"
- let s:g_blue = "#268bd2"
- let s:g_cyan = "#2aa198"
- let s:g_green = "#859900"
-else
- " these colors are for non-gui vim when CSApprox is installed. CSApprox
- " degrades the base colors poorly (bright blues instead of muted gray
- " blues) so we set all hex values here to ones which CSApprox will not
- " change and which we approve of. Perhaps I should just can the hex values
- " and use just the color table values, leaving these blank. Not much
- " difference either way and I'd rather be thorough about it.
- " They can also be used by setting g:solarized_degrade to 1 in vimrc
- let s:g_back = "#1c1c1c"
- let s:g_base03 = "#1c1c1c"
- let s:g_base02 = "#262626"
- let s:g_base01 = "#4e4e4e"
- let s:g_base00 = "#585858"
- let s:g_base0 = "#808080"
- let s:g_base1 = "#8a8a8a"
- let s:g_base2 = "#d7d7af"
- let s:g_base3 = "#ffffd7"
- let s:g_yellow = "#af8700"
- let s:g_orange = "#d75f00"
- let s:g_red = "#af0000"
- let s:g_magenta = "#af005f"
- let s:g_violet = "#5f5faf"
- let s:g_blue = "#0087ff"
- let s:g_cyan = "#00afaf"
- let s:g_green = "#5f8700"
-endif
-"}}}
-" 256 Terminal (no CSApprox) and 16 color fallback palettes"{{{
-" ---------------------------------------------------------------------
-" We also set this if gui is running as we use the optional formatting
-" values that get set here (ou==optional underline, ob==opt bold).
-if (has("gui_running") || &t_Co == 256) && g:solarized_termcolors != 16
- let s:c_back = "234"
- let s:c_base03 = "234"
- let s:c_base02 = "235"
- let s:c_base01 = "239"
- let s:c_base00 = "240"
- let s:c_base0 = "244"
- let s:c_base1 = "245"
- let s:c_base2 = "187"
- let s:c_base3 = "230"
- let s:c_yellow = "136"
- let s:c_orange = "166"
- let s:c_red = "124"
- let s:c_magenta = "125"
- let s:c_violet = "61"
- let s:c_blue = "33"
- let s:c_cyan = "37"
- let s:c_green = "64"
- let s:ou = ""
- let s:ob = ""
-elseif &t_Co > 8 || g:solarized_termcolors == 16
- " NOTE: this requires terminal colors to be set to solarized standard
- " 16 colors (see top of this file for details)
- let s:c_back = "NONE"
- let s:c_base03 = "8"
- let s:c_base02 = "0"
- let s:c_base01 = "10"
- let s:c_base00 = "11"
- let s:c_base0 = "12"
- let s:c_base1 = "14"
- let s:c_base2 = "7"
- let s:c_base3 = "15"
- let s:c_green = "2"
- let s:c_yellow = "3"
- let s:c_orange = "9"
- let s:c_red = "1"
- let s:c_magenta = "5"
- let s:c_violet = "13"
- let s:c_blue = "4"
- let s:c_cyan = "6"
- let s:ou = ""
- let s:ob = ""
-else " must be in an 8 color or less terminal
- let s:c_back = "NONE"
- let s:c_base03 = "4"
- let s:c_base02 = "darkgrey"
- let s:c_base01 = "grey"
- let s:c_base00 = "darkgrey"
- let s:c_base0 = "6"
- let s:c_base1 = "4"
- let s:c_base2 = "7"
- let s:c_base3 = "7"
- let s:c_green = "2"
- let s:c_yellow = "3"
- let s:c_orange = "3"
- let s:c_red = "1"
- let s:c_magenta = "5"
- let s:c_violet = "5"
- let s:c_blue = "4"
- let s:c_cyan = "6"
- let s:ou = ",underline"
- let s:ob = ",bold"
-endif
-"}}}
-" Formatting options and null values for passthrough effect"{{{
-" ---------------------------------------------------------------------
-let s:g_none = "NONE"
-let s:c_none = "NONE"
-let s:t_none = "NONE"
-let s:n = "NONE"
-let s:c = ",undercurl"
-let s:r = ",reverse"
-let s:s = ",standout"
-"}}}
-" Alternate light scheme "{{{
-" ---------------------------------------------------------------------
-if g:solarized_style == "light"
- let s:c_temp03 = s:c_base03
- let s:c_temp02 = s:c_base02
- let s:c_temp01 = s:c_base01
- let s:c_temp00 = s:c_base00
- let s:c_base03 = s:c_base3
- let s:c_base02 = s:c_base2
- let s:c_base01 = s:c_base1
- let s:c_base00 = s:c_base0
- let s:c_base0 = s:c_temp00
- let s:c_base1 = s:c_temp01
- let s:c_base2 = s:c_temp02
- let s:c_base3 = s:c_temp03
- let s:c_back = s:c_base03
- let s:g_temp03 = s:g_base03
- let s:g_temp02 = s:g_base02
- let s:g_temp01 = s:g_base01
- let s:g_temp00 = s:g_base00
- let s:g_base03 = s:g_base3
- let s:g_base02 = s:g_base2
- let s:g_base01 = s:g_base1
- let s:g_base00 = s:g_base0
- let s:g_base0 = s:g_temp00
- let s:g_base1 = s:g_temp01
- let s:g_base2 = s:g_temp02
- let s:g_base3 = s:g_temp03
- let s:g_back = s:g_base03
-endif
-"}}}
-" Alternate inverted background scheme "{{{
-" ---------------------------------------------------------------------
-if g:solarized_style == "inverted"
- let s:c_temp03 = s:c_base03
- let s:c_temp02 = s:c_base02
- let s:c_base03 = s:c_temp02
- let s:c_base02 = s:c_temp03
- let s:c_back = s:c_base03
- let s:g_temp03 = s:g_base03
- let s:g_temp02 = s:g_base02
- let s:g_base03 = s:g_temp02
- let s:g_base02 = s:g_temp03
- let s:g_back = s:g_base03
-endif
-"}}}
-" Optional contrast schemes "{{{
-" ---------------------------------------------------------------------
-if g:solarized_contrast == "high"
- let s:g_base03 = s:g_base03
- let s:g_base02 = s:g_base02
- let s:g_base01 = s:g_base00
- let s:g_base00 = s:g_base0
- let s:g_base0 = s:g_base1
- let s:g_base1 = s:g_base2
- let s:g_base2 = s:g_base3
- let s:g_base3 = s:g_base3
- let s:g_back = s:g_back
-endif
-if g:solarized_contrast == "low"
- let s:g_back = s:g_base02
- let s:ou = ",underline"
-endif
-"}}}
-" Overrides dependent on user specified values"{{{
-" ---------------------------------------------------------------------
-if g:solarized_termtrans == 1
- let s:c_back = "NONE"
-endif
-
-if g:solarized_bold == 1
- let s:b = ",bold"
-else
- let s:b = ""
-endif
-
-if g:solarized_underline == 1
- let s:u = ",underline"
-else
- let s:u = ""
-endif
-
-if g:solarized_italic == 1
- let s:i = ",italic"
-else
- let s:i = ""
-endif
-"}}}
-" Highlighting primitives"{{{
-" ---------------------------------------------------------------------
-
-exe "let s:bg_none = ' ctermbg=".s:c_none ." guibg=".s:g_none ."'"
-exe "let s:bg_back = ' ctermbg=".s:c_back ." guibg=".s:g_back ."'"
-exe "let s:bg_base03 = ' ctermbg=".s:c_base03 ." guibg=".s:g_base03 ."'"
-exe "let s:bg_base02 = ' ctermbg=".s:c_base02 ." guibg=".s:g_base02 ."'"
-exe "let s:bg_base01 = ' ctermbg=".s:c_base01 ." guibg=".s:g_base01 ."'"
-exe "let s:bg_base00 = ' ctermbg=".s:c_base00 ." guibg=".s:g_base00 ."'"
-exe "let s:bg_base0 = ' ctermbg=".s:c_base0 ." guibg=".s:g_base0 ."'"
-exe "let s:bg_base1 = ' ctermbg=".s:c_base1 ." guibg=".s:g_base1 ."'"
-exe "let s:bg_base2 = ' ctermbg=".s:c_base2 ." guibg=".s:g_base2 ."'"
-exe "let s:bg_base3 = ' ctermbg=".s:c_base3 ." guibg=".s:g_base3 ."'"
-exe "let s:bg_green = ' ctermbg=".s:c_green ." guibg=".s:g_green ."'"
-exe "let s:bg_yellow = ' ctermbg=".s:c_yellow ." guibg=".s:g_yellow ."'"
-exe "let s:bg_orange = ' ctermbg=".s:c_orange ." guibg=".s:g_orange ."'"
-exe "let s:bg_red = ' ctermbg=".s:c_red ." guibg=".s:g_red ."'"
-exe "let s:bg_magenta = ' ctermbg=".s:c_magenta." guibg=".s:g_magenta."'"
-exe "let s:bg_violet = ' ctermbg=".s:c_violet ." guibg=".s:g_violet ."'"
-exe "let s:bg_blue = ' ctermbg=".s:c_blue ." guibg=".s:g_blue ."'"
-exe "let s:bg_cyan = ' ctermbg=".s:c_cyan ." guibg=".s:g_cyan ."'"
-
-exe "let s:fg_none = ' ctermfg=".s:c_none ." guifg=".s:g_none ."'"
-exe "let s:fg_back = ' ctermfg=".s:c_back ." guifg=".s:g_back ."'"
-exe "let s:fg_base03 = ' ctermfg=".s:c_base03 ." guifg=".s:g_base03 ."'"
-exe "let s:fg_base02 = ' ctermfg=".s:c_base02 ." guifg=".s:g_base02 ."'"
-exe "let s:fg_base01 = ' ctermfg=".s:c_base01 ." guifg=".s:g_base01 ."'"
-exe "let s:fg_base00 = ' ctermfg=".s:c_base00 ." guifg=".s:g_base00 ."'"
-exe "let s:fg_base0 = ' ctermfg=".s:c_base0 ." guifg=".s:g_base0 ."'"
-exe "let s:fg_base1 = ' ctermfg=".s:c_base1 ." guifg=".s:g_base1 ."'"
-exe "let s:fg_base2 = ' ctermfg=".s:c_base2 ." guifg=".s:g_base2 ."'"
-exe "let s:fg_base3 = ' ctermfg=".s:c_base3 ." guifg=".s:g_base3 ."'"
-exe "let s:fg_green = ' ctermfg=".s:c_green ." guifg=".s:g_green ."'"
-exe "let s:fg_yellow = ' ctermfg=".s:c_yellow ." guifg=".s:g_yellow ."'"
-exe "let s:fg_orange = ' ctermfg=".s:c_orange ." guifg=".s:g_orange ."'"
-exe "let s:fg_red = ' ctermfg=".s:c_red ." guifg=".s:g_red ."'"
-exe "let s:fg_magenta = ' ctermfg=".s:c_magenta." guifg=".s:g_magenta."'"
-exe "let s:fg_violet = ' ctermfg=".s:c_violet ." guifg=".s:g_violet ."'"
-exe "let s:fg_blue = ' ctermfg=".s:c_blue ." guifg=".s:g_blue ."'"
-exe "let s:fg_cyan = ' ctermfg=".s:c_cyan ." guifg=".s:g_cyan ."'"
-
-exe "let s:sp_none = ' guisp=".s:g_none ."'"
-exe "let s:sp_back = ' guisp=".s:g_back ."'"
-exe "let s:sp_base03 = ' guisp=".s:g_base03 ."'"
-exe "let s:sp_base02 = ' guisp=".s:g_base02 ."'"
-exe "let s:sp_base01 = ' guisp=".s:g_base01 ."'"
-exe "let s:sp_base00 = ' guisp=".s:g_base00 ."'"
-exe "let s:sp_base0 = ' guisp=".s:g_base0 ."'"
-exe "let s:sp_base1 = ' guisp=".s:g_base1 ."'"
-exe "let s:sp_base2 = ' guisp=".s:g_base2 ."'"
-exe "let s:sp_base3 = ' guisp=".s:g_base3 ."'"
-exe "let s:sp_green = ' guisp=".s:g_green ."'"
-exe "let s:sp_yellow = ' guisp=".s:g_yellow ."'"
-exe "let s:sp_orange = ' guisp=".s:g_orange ."'"
-exe "let s:sp_red = ' guisp=".s:g_red ."'"
-exe "let s:sp_magenta = ' guisp=".s:g_magenta."'"
-exe "let s:sp_violet = ' guisp=".s:g_violet ."'"
-exe "let s:sp_blue = ' guisp=".s:g_blue ."'"
-exe "let s:sp_cyan = ' guisp=".s:g_cyan ."'"
-
-exe "let s:fmt_none = ' cterm=NONE". " gui=NONE". " term=NONE". "'"
-exe "let s:fmt_bold = ' cterm=NONE".s:b." gui=NONE".s:b." term=NONE".s:b."'"
-exe "let s:fmt_bldi = ' cterm=NONE".s:b." gui=NONE".s:b.s:i." term=NONE".s:b."'"
-exe "let s:fmt_undr = ' cterm=NONE".s:u." gui=NONE".s:u." term=NONE".s:u."'"
-exe "let s:fmt_undb = ' cterm=NONE".s:u.s:b." gui=NONE".s:u.s:b.
- \" term=NONE".s:u.s:b."'"
-exe "let s:fmt_undi = ' cterm=NONE".s:u." gui=NONE".s:u.s:i.
- \" term=NONE".s:u."'"
-exe "let s:fmt_uopt = ' cterm=NONE".s:ou." gui=NONE".s:ou.
- \" term=NONE".s:ou."'"
-exe "let s:fmt_bopt = ' cterm=NONE".s:ob." gui=NONE".s:ob.
- \" term=NONE".s:ob."'"
-exe "let s:fmt_curl = ' cterm=NONE".s:c." gui=NONE".s:c." term=NONE".s:c."'"
-exe "let s:fmt_ital = ' cterm=NONE". " gui=NONE".s:i." term=NONE". "'"
-exe "let s:fmt_revr = ' cterm=NONE".s:r." gui=NONE".s:r." term=NONE".s:r."'"
-exe "let s:fmt_stnd = ' cterm=NONE".s:s." gui=NONE".s:s." term=NONE".s:s."'"
-"}}}
-" Basic highlighting"{{{
-" ---------------------------------------------------------------------
-" note that link syntax to avoid duplicate configuration doesn't work with the
-" exe compiled formats
-
-exe "hi Normal" . s:fg_base0 .s:bg_back .s:fmt_none
-
-exe "hi Comment" . s:fg_base01 .s:bg_none .s:fmt_ital
-" *Comment any comment
-
-exe "hi Constant" . s:fg_cyan .s:bg_none .s:fmt_none
-"exe "hi String" . s:fg_yellow .s:bg_none .s:fmt_none
-" *Constant any constant
-" String a string constant: "this is a string"
-" Character a character constant: 'c', '\n'
-" Number a number constant: 234, 0xff
-" Boolean a boolean constant: TRUE, false
-" Float a floating point constant: 2.3e10
-
-exe "hi Identifier" . s:fg_blue .s:bg_none .s:fmt_none
-" *Identifier any variable name
-" Function function name (also: methods for classes)
-"
-exe "hi Statement" . s:fg_green .s:bg_none .s:fmt_none
-" *Statement any statement
-" Conditional if, then, else, endif, switch, etc.
-" Repeat for, do, while, etc.
-" Label case, default, etc.
-" Operator "sizeof", "+", "*", etc.
-" Keyword any other keyword
-" Exception try, catch, throw
-
-exe "hi PreProc" . s:fg_orange .s:bg_none .s:fmt_none
-" *PreProc generic Preprocessor
-" Include preprocessor #include
-" Define preprocessor #define
-" Macro same as Define
-" PreCondit preprocessor #if, #else, #endif, etc.
-
-exe "hi Type" . s:fg_yellow .s:bg_none .s:fmt_none
-" *Type int, long, char, etc.
-" StorageClass static, register, volatile, etc.
-" Structure struct, union, enum, etc.
-" Typedef A typedef
-
-exe "hi Special" . s:fg_red .s:bg_none .s:fmt_none
-" *Special any special symbol
-" SpecialChar special character in a constant
-" Tag you can use CTRL-] on this
-" Delimiter character that needs attention
-" SpecialComment special things inside a comment
-" Debug debugging statements
-
-exe "hi Underlined" . s:fg_violet .s:bg_none .s:fmt_none
-" *Underlined text that stands out, HTML links
-
-exe "hi Ignore" . s:fg_none .s:bg_none .s:fmt_none
-" *Ignore left blank, hidden |hl-Ignore|
-
-exe "hi Error" . s:fg_red .s:bg_none .s:fmt_bold
-" *Error any erroneous construct
-
-exe "hi Todo" . s:fg_magenta.s:bg_none .s:fmt_bold
-" *Todo anything that needs extra attention; mostly the
-" keywords TODO FIXME and XXX
-"
-"Highlighting groups for various occasions
-"-----------------------------------------
-exe "hi SpecialKey" . s:fg_base02 .s:bg_none .s:fmt_none
-exe "hi NonText" . s:fg_base02 .s:bg_none .s:fmt_bold
-exe "hi Directory" . s:fg_blue .s:bg_none .s:fmt_none
-exe "hi ErrorMsg" . s:fg_red .s:bg_none .s:fmt_revr
-exe "hi IncSearch" . s:fg_yellow .s:bg_none .s:fmt_revr
-exe "hi Search" . s:fg_yellow .s:bg_none .s:fmt_stnd
-exe "hi MoreMsg" . s:fg_blue .s:bg_none .s:fmt_none
-exe "hi ModeMsg" . s:fg_blue .s:bg_none .s:fmt_none
-exe "hi LineNr" . s:fg_base01 .s:bg_base02 .s:fmt_none
-exe "hi Question" . s:fg_cyan .s:bg_none .s:fmt_bold
-exe "hi StatusLine" . s:fg_base0 .s:bg_base02 .s:fmt_none
-exe "hi StatusLineNC" . s:fg_base1 .s:bg_base02 .s:fmt_none
-exe "hi VertSplit" . s:fg_base0 .s:bg_base02 .s:fmt_none
-exe "hi Title" . s:fg_orange .s:bg_none .s:fmt_bold
-exe "hi Visual" . s:fg_none .s:bg_base02 .s:fmt_stnd
-exe "hi VisualNOS" . s:fg_none .s:bg_base02 .s:fmt_stnd
-exe "hi WarningMsg" . s:fg_red .s:bg_none .s:fmt_bold
-exe "hi WildMenu" . s:fg_base1 .s:bg_base02 .s:fmt_none
-exe "hi Folded" . s:fg_base0 .s:bg_base02 .s:fmt_undr .s:sp_base03
-exe "hi FoldColumn" . s:fg_base0 .s:bg_base02 .s:fmt_bold
-exe "hi DiffAdd" . s:fg_green .s:bg_none .s:fmt_revr
-exe "hi DiffChange" . s:fg_yellow .s:bg_none .s:fmt_revr
-exe "hi DiffDelete" . s:fg_red .s:bg_none .s:fmt_revr
-exe "hi DiffText" . s:fg_blue .s:bg_none .s:fmt_revr
-exe "hi SignColumn" . s:fg_base0 .s:bg_base02 .s:fmt_none
-exe "hi Conceal" . s:fg_blue .s:bg_none .s:fmt_none
-exe "hi SpellBad" . s:fg_none .s:bg_none .s:fmt_curl .s:sp_red
-exe "hi SpellCap" . s:fg_none .s:bg_none .s:fmt_curl .s:sp_violet
-exe "hi SpellRare" . s:fg_none .s:bg_none .s:fmt_curl .s:sp_cyan
-exe "hi SpellLocal" . s:fg_none .s:bg_none .s:fmt_curl .s:sp_yellow
-exe "hi Pmenu" . s:fg_base0 .s:bg_base02 .s:fmt_none
-exe "hi PmenuSel" . s:fg_base2 .s:bg_base01 .s:fmt_none
-exe "hi PmenuSbar" . s:fg_base0 .s:bg_base2 .s:fmt_none
-exe "hi PmenuThumb" . s:fg_base03 .s:bg_base0 .s:fmt_none
-exe "hi TabLine" . s:fg_base0 .s:bg_base02 .s:fmt_undr .s:sp_base0
-exe "hi TabLineSel" . s:fg_base2 .s:bg_base01 .s:fmt_undr .s:sp_base0
-exe "hi TabLineFill" . s:fg_base0 .s:bg_base02 .s:fmt_undr .s:sp_base0
-exe "hi CursorColumn" . s:fg_none .s:bg_base02 .s:fmt_none
-exe "hi CursorLine" . s:fg_none .s:bg_base02 .s:fmt_uopt .s:sp_base1
-exe "hi ColorColumn" . s:fg_none .s:bg_base02 .s:fmt_none
-exe "hi Cursor" . s:fg_none .s:bg_none .s:fmt_revr
-exe "hi lCursor" . s:fg_none .s:bg_none .s:fmt_stnd
-exe "hi MatchParen" . s:fg_red .s:bg_base01 .s:fmt_bold
-
-"}}}
-" Extended highlighting "{{{
-" ---------------------------------------------------------------------
-"}}}
-" vim syntax highlighting "{{{
-" ---------------------------------------------------------------------
-exe "hi vimLineComment" . s:fg_base01 .s:bg_none .s:fmt_ital
-exe "hi vimCommentString".s:fg_violet .s:bg_none .s:fmt_none
-hi link vimVar Identifier
-hi link vimFunc Function
-hi link vimUserFunc Function
-exe "hi vimCommand" . s:fg_yellow .s:bg_none .s:fmt_none
-exe "hi vimCmdSep" . s:fg_blue .s:bg_none .s:fmt_bold
-exe "hi helpExample" . s:fg_base1 .s:bg_none .s:fmt_none
-hi link helpSpecial Special
-"exe "hi helpSpecial" . s:fg_yellow .s:bg_none .s:fmt_none
-exe "hi helpOption" . s:fg_cyan .s:bg_none .s:fmt_none
-exe "hi helpNote" . s:fg_magenta.s:bg_none .s:fmt_none
-exe "hi helpVim" . s:fg_magenta.s:bg_none .s:fmt_none
-exe "hi helpHyperTextJump".s:fg_blue .s:bg_none .s:fmt_undr
-exe "hi helpHyperTextEntry".s:fg_green .s:bg_none .s:fmt_none
-exe "hi vimIsCommand" . s:fg_base00 .s:bg_none .s:fmt_none
-exe "hi vimSynMtchOpt". s:fg_yellow .s:bg_none .s:fmt_none
-exe "hi vimSynType" . s:fg_cyan .s:bg_none .s:fmt_none
-exe "hi vimHiLink" . s:fg_blue .s:bg_none .s:fmt_none
-exe "hi vimHiGroup" . s:fg_blue .s:bg_none .s:fmt_none
-exe "hi vimGroup" . s:fg_blue .s:bg_none .s:fmt_undb
-"}}}
-" html highlighting "{{{
-" ---------------------------------------------------------------------
-exe "hi htmlTag" . s:fg_base01 .s:bg_none .s:fmt_none
-exe "hi htmlEndTag" . s:fg_base01 .s:bg_none .s:fmt_none
-exe "hi htmlTagN" . s:fg_base1 .s:bg_none .s:fmt_bold
-exe "hi htmlTagName" . s:fg_blue .s:bg_none .s:fmt_bold
-exe "hi htmlSpecialTagName". s:fg_blue .s:bg_none .s:fmt_ital
-exe "hi htmlArg" . s:fg_base00 .s:bg_none .s:fmt_none
-exe "hi javaScript" . s:fg_yellow .s:bg_none .s:fmt_none
-"}}}
-" perl highlighting "{{{
-" ---------------------------------------------------------------------
-exe "hi perlHereDoc" . s:fg_base1 .s:bg_back .s:fmt_none
-exe "hi perlVarPlain" . s:fg_yellow .s:bg_back .s:fmt_none
-exe "hi perlStatementFileDesc" . s:fg_cyan .s:bg_back .s:fmt_none
-
-"}}}
-" tex highlighting "{{{
-" ---------------------------------------------------------------------
-exe "hi texStatement" . s:fg_cyan .s:bg_back .s:fmt_none
-exe "hi texMathZoneX" . s:fg_yellow .s:bg_back .s:fmt_none
-exe "hi texMathMatcher" . s:fg_yellow .s:bg_back .s:fmt_none
-exe "hi texMathMatcher" . s:fg_yellow .s:bg_back .s:fmt_none
-exe "hi texRefLabel" . s:fg_yellow .s:bg_back .s:fmt_none
-"}}}
-" ruby highlighting "{{{
-" ---------------------------------------------------------------------
-exe "hi rubyDefine" . s:fg_base1 .s:bg_back .s:fmt_bold
-"rubyInclude
-"rubySharpBang
-"rubyAccess
-"rubyPredefinedVariable
-"rubyBoolean
-"rubyClassVariable
-"rubyBeginEnd
-"rubyRepeatModifier
-"hi link rubyArrayDelimiter Special " [ , , ]
-"rubyCurlyBlock { , , }
-
-"hi link rubyClass Keyword
-"hi link rubyModule Keyword
-"hi link rubyKeyword Keyword
-"hi link rubyOperator Operator
-"hi link rubyIdentifier Identifier
-"hi link rubyInstanceVariable Identifier
-"hi link rubyGlobalVariable Identifier
-"hi link rubyClassVariable Identifier
-"hi link rubyConstant Type
-"}}}
-" haskell syntax highlighting"{{{
-" ---------------------------------------------------------------------
-" For use with syntax/haskell.vim : Haskell Syntax File
-" http://www.vim.org/scripts/script.php?script_id=3034
-" See also Steffen Siering's github repository:
-" http://github.com/urso/dotrc/blob/master/vim/syntax/haskell.vim
-" ---------------------------------------------------------------------
-"
-" Treat True and False specially, see the plugin referenced above
-let hs_highlight_boolean=1
-" highlight delims, see the plugin referenced above
-let hs_highlight_delimiters=1
-
-exe "hi cPreCondit". s:fg_orange.s:bg_none .s:fmt_none
-
-exe "hi VarId" . s:fg_blue .s:bg_none .s:fmt_none
-exe "hi ConId" . s:fg_yellow .s:bg_none .s:fmt_none
-exe "hi hsImport" . s:fg_magenta.s:bg_none .s:fmt_none
-exe "hi hsString" . s:fg_base00 .s:bg_none .s:fmt_none
-
-exe "hi hsStructure" . s:fg_cyan .s:bg_none .s:fmt_none
-exe "hi hs_hlFunctionName" . s:fg_blue .s:bg_none
-exe "hi hsStatement" . s:fg_cyan .s:bg_none .s:fmt_none
-exe "hi hsImportLabel" . s:fg_cyan .s:bg_none .s:fmt_none
-exe "hi hs_OpFunctionName" . s:fg_yellow .s:bg_none .s:fmt_none
-exe "hi hs_DeclareFunction" . s:fg_orange .s:bg_none .s:fmt_none
-exe "hi hsVarSym" . s:fg_cyan .s:bg_none .s:fmt_none
-exe "hi hsType" . s:fg_yellow .s:bg_none .s:fmt_none
-exe "hi hsTypedef" . s:fg_cyan .s:bg_none .s:fmt_none
-exe "hi hsModuleName" . s:fg_green .s:bg_none .s:fmt_undr
-exe "hi hsModuleStartLabel" . s:fg_magenta.s:bg_none .s:fmt_none
-hi link hsImportParams Delimiter
-hi link hsDelimTypeExport Delimiter
-hi link hsModuleStartLabel hsStructure
-hi link hsModuleWhereLabel hsModuleStartLabel
-
-" following is for the haskell-conceal plugin
-" the first two items don't have an impact, but better safe
-exe "hi hsNiceOperator" . s:fg_cyan .s:bg_none .s:fmt_none
-exe "hi hsniceoperator" . s:fg_cyan .s:bg_none .s:fmt_none
-
-"}}}
-" pandoc markdown syntax highlighting "{{{
-" ---------------------------------------------------------------------
-
-"PandocHiLink pandocNormalBlock
-exe "hi pandocTitleBlock" .s:fg_blue .s:bg_none .s:fmt_none
-exe "hi pandocTitleBlockTitle" .s:fg_blue .s:bg_none .s:fmt_bold
-exe "hi pandocTitleComment" .s:fg_blue .s:bg_none .s:fmt_bold
-exe "hi pandocComment" .s:fg_base01 .s:bg_none .s:fmt_ital
-exe "hi pandocVerbatimBlock" .s:fg_yellow .s:bg_none .s:fmt_none
-hi link pandocVerbatimBlockDeep pandocVerbatimBlock
-hi link pandocCodeBlock pandocVerbatimBlock
-hi link pandocCodeBlockDelim pandocVerbatimBlock
-exe "hi pandocBlockQuote" .s:fg_blue .s:bg_none .s:fmt_none
-exe "hi pandocBlockQuoteLeader1" .s:fg_blue .s:bg_none .s:fmt_none
-exe "hi pandocBlockQuoteLeader2" .s:fg_cyan .s:bg_none .s:fmt_none
-exe "hi pandocBlockQuoteLeader3" .s:fg_yellow .s:bg_none .s:fmt_none
-exe "hi pandocBlockQuoteLeader4" .s:fg_red .s:bg_none .s:fmt_none
-exe "hi pandocBlockQuoteLeader5" .s:fg_base0 .s:bg_none .s:fmt_none
-exe "hi pandocBlockQuoteLeader6" .s:fg_base01 .s:bg_none .s:fmt_none
-exe "hi pandocListMarker" .s:fg_magenta.s:bg_none .s:fmt_none
-exe "hi pandocListReference" .s:fg_magenta.s:bg_none .s:fmt_undr
-
-" Definitions
-" ---------------------------------------------------------------------
-let s:fg_pdef = s:fg_violet
-exe "hi pandocDefinitionBlock" .s:fg_pdef .s:bg_none .s:fmt_none
-exe "hi pandocDefinitionTerm" .s:fg_pdef .s:bg_none .s:fmt_stnd
-exe "hi pandocDefinitionIndctr" .s:fg_pdef .s:bg_none .s:fmt_bold
-exe "hi pandocEmphasisDefinition" .s:fg_pdef .s:bg_none .s:fmt_ital
-exe "hi pandocEmphasisNestedDefinition" .s:fg_pdef .s:bg_none .s:fmt_bldi
-exe "hi pandocStrongEmphasisDefinition" .s:fg_pdef .s:bg_none .s:fmt_bold
-exe "hi pandocStrongEmphasisNestedDefinition" .s:fg_pdef.s:bg_none.s:fmt_bldi
-exe "hi pandocStrongEmphasisEmphasisDefinition" .s:fg_pdef.s:bg_none.s:fmt_bldi
-exe "hi pandocStrikeoutDefinition" .s:fg_pdef .s:bg_none .s:fmt_revr
-exe "hi pandocVerbatimInlineDefinition" .s:fg_pdef .s:bg_none .s:fmt_none
-exe "hi pandocSuperscriptDefinition" .s:fg_pdef .s:bg_none .s:fmt_none
-exe "hi pandocSubscriptDefinition" .s:fg_pdef .s:bg_none .s:fmt_none
-
-" Tables
-" ---------------------------------------------------------------------
-let s:fg_ptable = s:fg_blue
-exe "hi pandocTable" .s:fg_ptable.s:bg_none .s:fmt_none
-exe "hi pandocTableStructure" .s:fg_ptable.s:bg_none .s:fmt_none
-hi link pandocTableStructureTop pandocTableStructre
-hi link pandocTableStructureEnd pandocTableStructre
-exe "hi pandocTableZebraLight" .s:fg_ptable.s:bg_base03.s:fmt_none
-exe "hi pandocTableZebraDark" .s:fg_ptable.s:bg_base02.s:fmt_none
-exe "hi pandocEmphasisTable" .s:fg_ptable.s:bg_none .s:fmt_ital
-exe "hi pandocEmphasisNestedTable" .s:fg_ptable.s:bg_none .s:fmt_bldi
-exe "hi pandocStrongEmphasisTable" .s:fg_ptable.s:bg_none .s:fmt_bold
-exe "hi pandocStrongEmphasisNestedTable" .s:fg_ptable.s:bg_none .s:fmt_bldi
-exe "hi pandocStrongEmphasisEmphasisTable" .s:fg_ptable.s:bg_none .s:fmt_bldi
-exe "hi pandocStrikeoutTable" .s:fg_ptable.s:bg_none .s:fmt_revr
-exe "hi pandocVerbatimInlineTable" .s:fg_ptable.s:bg_none .s:fmt_none
-exe "hi pandocSuperscriptTable" .s:fg_ptable.s:bg_none .s:fmt_none
-exe "hi pandocSubscriptTable" .s:fg_ptable.s:bg_none .s:fmt_none
-
-" Headings
-" ---------------------------------------------------------------------
-let s:fg_phead = s:fg_orange
-exe "hi pandocHeading" .s:fg_phead .s:bg_none.s:fmt_bold
-exe "hi pandocHeadingMarker" .s:fg_yellow.s:bg_none.s:fmt_bold
-exe "hi pandocEmphasisHeading" .s:fg_phead .s:bg_none.s:fmt_bldi
-exe "hi pandocEmphasisNestedHeading" .s:fg_phead .s:bg_none.s:fmt_bldi
-exe "hi pandocStrongEmphasisHeading" .s:fg_phead .s:bg_none.s:fmt_bold
-exe "hi pandocStrongEmphasisNestedHeading" .s:fg_phead .s:bg_none.s:fmt_bldi
-exe "hi pandocStrongEmphasisEmphasisHeading".s:fg_phead .s:bg_none.s:fmt_bldi
-exe "hi pandocStrikeoutHeading" .s:fg_phead .s:bg_none.s:fmt_revr
-exe "hi pandocVerbatimInlineHeading" .s:fg_phead .s:bg_none.s:fmt_bold
-exe "hi pandocSuperscriptHeading" .s:fg_phead .s:bg_none.s:fmt_bold
-exe "hi pandocSubscriptHeading" .s:fg_phead .s:bg_none.s:fmt_bold
-
-" Links
-" ---------------------------------------------------------------------
-exe "hi pandocLinkDelim" .s:fg_base01 .s:bg_none .s:fmt_none
-exe "hi pandocLinkLabel" .s:fg_blue .s:bg_none .s:fmt_undr
-exe "hi pandocLinkText" .s:fg_blue .s:bg_none .s:fmt_undb
-exe "hi pandocLinkURL" .s:fg_base00 .s:bg_none .s:fmt_undr
-exe "hi pandocLinkTitle" .s:fg_base00 .s:bg_none .s:fmt_undi
-exe "hi pandocLinkTitleDelim" .s:fg_base01 .s:bg_none .s:fmt_undi .s:sp_base00
-exe "hi pandocLinkDefinition" .s:fg_cyan .s:bg_none .s:fmt_undr .s:sp_base00
-exe "hi pandocLinkDefinitionID" .s:fg_blue .s:bg_none .s:fmt_bold
-exe "hi pandocImageCaption" .s:fg_violet .s:bg_none .s:fmt_undb
-exe "hi pandocFootnoteLink" .s:fg_green .s:bg_none .s:fmt_undr
-exe "hi pandocFootnoteDefLink" .s:fg_green .s:bg_none .s:fmt_bold
-exe "hi pandocFootnoteInline" .s:fg_green .s:bg_none .s:fmt_undb
-exe "hi pandocFootnote" .s:fg_green .s:bg_none .s:fmt_none
-exe "hi pandocCitationDelim" .s:fg_magenta.s:bg_none .s:fmt_none
-exe "hi pandocCitation" .s:fg_magenta.s:bg_none .s:fmt_none
-exe "hi pandocCitationID" .s:fg_magenta.s:bg_none .s:fmt_undr
-exe "hi pandocCitationRef" .s:fg_magenta.s:bg_none .s:fmt_none
-
-" Main Styles
-" ---------------------------------------------------------------------
-exe "hi pandocStyleDelim" .s:fg_base01 .s:bg_none .s:fmt_none
-exe "hi pandocEmphasis" .s:fg_base0 .s:bg_none .s:fmt_ital
-exe "hi pandocEmphasisNested" .s:fg_base0 .s:bg_none .s:fmt_bldi
-exe "hi pandocStrongEmphasis" .s:fg_base0 .s:bg_none .s:fmt_bold
-exe "hi pandocStrongEmphasisNested" .s:fg_base0 .s:bg_none .s:fmt_bldi
-exe "hi pandocStrongEmphasisEmphasis" .s:fg_base0 .s:bg_none .s:fmt_bldi
-exe "hi pandocStrikeout" .s:fg_base01 .s:bg_none .s:fmt_revr
-exe "hi pandocVerbatimInline" .s:fg_yellow .s:bg_none .s:fmt_none
-exe "hi pandocSuperscript" .s:fg_violet .s:bg_none .s:fmt_none
-exe "hi pandocSubscript" .s:fg_violet .s:bg_none .s:fmt_none
-
-exe "hi pandocRule" .s:fg_blue .s:bg_none .s:fmt_bold
-exe "hi pandocRuleLine" .s:fg_blue .s:bg_none .s:fmt_bold
-exe "hi pandocEscapePair" .s:fg_red .s:bg_none .s:fmt_bold
-exe "hi pandocCitationRef" .s:fg_magenta.s:bg_none .s:fmt_none
-exe "hi pandocNonBreakingSpace" . s:fg_red .s:bg_none .s:fmt_revr
-hi link pandocEscapedCharacter pandocEscapePair
-hi link pandocLineBreak pandocEscapePair
-
-" Embedded Code
-" ---------------------------------------------------------------------
-exe "hi pandocMetadataDelim" .s:fg_base01 .s:bg_none .s:fmt_none
-exe "hi pandocMetadata" .s:fg_blue .s:bg_none .s:fmt_none
-exe "hi pandocMetadataKey" .s:fg_blue .s:bg_none .s:fmt_none
-exe "hi pandocMetadata" .s:fg_blue .s:bg_none .s:fmt_bold
-hi link pandocMetadataTitle pandocMetadata
-
-"}}}
-" License "{{{
-" ---------------------------------------------------------------------
-"
-" Copyright (c) 2011 Ethan Schoonover
-"
-" Permission is hereby granted, free of charge, to any person obtaining a copy
-" of this software and associated documentation files (the "Software"), to deal
-" in the Software without restriction, including without limitation the rights
-" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-" copies of the Software, and to permit persons to whom the Software is
-" furnished to do so, subject to the following conditions:
-"
-" The above copyright notice and this permission notice shall be included in
-" all copies or substantial portions of the Software.
-"
-" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-" THE SOFTWARE.
-"
-"}}}
diff --git a/xresources-colors-solarized/Xresources b/xresources-colors-solarized/Xresources
deleted file mode 100644
index 0e5fc02..0000000
--- a/xresources-colors-solarized/Xresources
+++ /dev/null
@@ -1,77 +0,0 @@
-!! drop in Solarized colorscheme for Xresources/Xdefaults
-
-!!SOLARIZED HEX 16/8 TERMCOL XTERM/HEX L*A*B RGB HSB
-!!--------- ------- ---- ------- ----------- ---------- ----------- -----------
-!!base03 #002b36 8/4 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21
-!!base02 #073642 0/4 black 235 #262626 20 -12 -12 7 54 66 192 90 26
-!!base01 #586e75 10/7 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46
-!!base00 #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51
-!!base0 #839496 12/6 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59
-!!base1 #93a1a1 14/4 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63
-!!base2 #eee8d5 7/7 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93
-!!base3 #fdf6e3 15/7 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99
-!!yellow #b58900 3/3 yellow 136 #af8700 60 10 65 181 137 0 45 100 71
-!!orange #cb4b16 9/3 brred 166 #d75f00 50 50 55 203 75 22 18 89 80
-!!red #dc322f 1/1 red 160 #d70000 50 65 45 220 50 47 1 79 86
-!!magenta #d33682 5/5 magenta 125 #af005f 50 65 -05 211 54 130 331 74 83
-!!violet #6c71c4 13/5 brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77
-!!blue #268bd2 4/4 blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82
-!!cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63
-!!green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60
-
-#define S_base03 #002b36
-#define S_base02 #073642
-#define S_base01 #586e75
-#define S_base00 #657b83
-#define S_base0 #839496
-#define S_base1 #93a1a1
-#define S_base2 #eee8d5
-#define S_base3 #fdf6e3
-#define S_green #b58900
-#define S_yellow #cb4b16
-#define S_orange #d30102
-#define S_red #dc322f
-#define S_magenta #6c71c4
-#define S_violet #268bd2
-#define S_blue #2aa198
-#define S_cyan #859900
-
-*background: S_base03
-*foreground: S_base00
-*fading: 40
-*fadeColor: S_base03
-*cursorColor: S_base1
-*pointerColorBackground:S_base01
-*pointerColorForeground:S_base1
-
-!! black dark/light
-*color0: S_base02
-*color8: S_base03
-
-!! red dark/light
-*color1: S_red
-*color9: S_orange
-
-!! green dark/light
-*color2: S_green
-*color10: S_base01
-
-!! yellow dark/light
-*color3: S_yellow
-*color11: S_base00
-
-!! blue dark/light
-*color4: S_blue
-*color12: S_base0
-
-!! magenta dark/light[
-*color5: S_magenta
-*color13: S_violet
-
-!! cyan dark/light
-*color6: S_cyan
-*color14: S_base1
-
-!! white dark/light
-*color7: S_base2
-*color15: S_base3