Move some common snippets to separate templates.

templates/_cleanup.colortemplate

@@ -0,0 +1,3 @@
+# vim: ft=colortemplate fdm=marker
+#unlet s:termtrans
+

templates/_global.colortemplate

@@ -0,0 +1,5 @@
+# vim: ft=colortemplate fdm=marker
+#let s:italics = s:italics && get(g:, '@optionprefix_italics', 1)
+#let s:termtrans = get(g:, '@optionprefix_termtrans', 0) && !has('gui_running')
+Include: _linked_groups.colortemplate
+

templates/_info.colortemplate

@@ -0,0 +1,9 @@
+# vim: ft=colortemplate fdm=marker
+Author:          Ethan Schoonover
+Maintainer:      Lifepillar <lifepillar@lifepillar.me>
+Website:         https://github.com/lifepillar/vim-solarized8
+Description:     Precision colors for machines and people
+Option Prefix:   solarized
+License:         OSI approved MIT license
+Neovim:          yes
+

templates/solarized8.colortemplate

@@ -3,13 +3,7 @@
 # Information {{{
 Full name:       Solarized 8
 Short name:      solarized8
-Author:          Ethan Schoonover
+Include:        _info.colortemplate
-Maintainer:      Lifepillar <lifepillar@lifepillar.me>
-Website:         https://github.com/lifepillar/vim-solarized8
-Description:     Precision colors for machines and people
-Option Prefix:   solarized
-License:         OSI approved MIT license
-Neovim:          yes
 # }}}
 # Documentation {{{
 Include: _help.colortemplate
@@ -220,7 +214,7 @@ TermCursorNC         base03            base01
 # Extra stuff (dark) {{{
 Include: _extra.colortemplate
 # }}}
-#unlet s:termtrans
+Include: _cleanup.colortemplate
 
 Background: light
 # Light color palette {{{
@@ -429,11 +423,11 @@ TermCursorNC         base03            base01
 # Extra stuff (light) {{{
 Include: _extra.colortemplate
 # }}}
-#unlet s:termtrans
+Include: _cleanup.colortemplate
 
 Background: any
 # B&W variant {{{
 Include: _bw.colortemplate
 # }}}
-#unlet s:termtrans
+Include: _cleanup.colortemplate
 

templates/solarized8_flat.colortemplate

@@ -3,19 +3,10 @@
 # Information {{{
 Full name:       Solarized 8 Flat
 Short name:      solarized8_flat
-Author:          Ethan Schoonover
+Include:        _info.colortemplate
-Maintainer:      Lifepillar <lifepillar@lifepillar.me>
-Website:         https://github.com/lifepillar/vim-solarized8
-Description:     Precision colors for machines and people
-Option Prefix:   solarized
-License:         OSI approved MIT license
-Neovim:          yes
 # }}}
 
-#let s:italics = s:italics && get(g:, '@optionprefix_italics', 1)
+Include: _global.colortemplate
-#let s:termtrans = get(g:, '@optionprefix_termtrans', 0) && !has('gui_running')
-
-Include: _linked_groups.colortemplate
 
 Variant: gui 256 16
 
@@ -185,7 +176,7 @@ TermCursorNC         base03            base01
 # Extra stuff (light) {{{
 Include: _extra.colortemplate
 # }}}
-#unlet s:termtrans
+Include: _cleanup.colortemplate
 
 Background: light
 # Light color palette {{{
@@ -363,11 +354,11 @@ TermCursorNC         base03            base01
 # Extra stuff (light) {{{
 Include: _extra.colortemplate
 # }}}
-#unlet s:termtrans
+Include: _cleanup.colortemplate
 
 Background: any
 # B&W variant {{{
 Include: _bw.colortemplate
 # }}}
-#unlet s:termtrans
+Include: _cleanup.colortemplate
 

templates/solarized8_high.colortemplate

@@ -3,19 +3,10 @@
 # Information {{{
 Full name:       Solarized 8 High Contrast
 Short name:      solarized8_high
-Author:          Ethan Schoonover
+Include:        _info.colortemplate
-Maintainer:      Lifepillar <lifepillar@lifepillar.me>
-Website:         https://github.com/lifepillar/vim-solarized8
-Description:     Precision colors for machines and people
-Option Prefix:   solarized
-License:         OSI approved MIT license
-Neovim:          yes
 # }}}
 
-#let s:italics = s:italics && get(g:, '@optionprefix_italics', 1)
+Include: _global.colortemplate
-#let s:termtrans = get(g:, '@optionprefix_termtrans', 0) && !has('gui_running')
-
-Include: _linked_groups.colortemplate
 
 Variant: gui 256 16
 
@@ -211,7 +202,7 @@ TermCursorNC         base03            base01
 # Extra stuff (dark) {{{
 Include: _extra.colortemplate
 # }}}
-#unlet s:termtrans
+Include: _cleanup.colortemplate
 
 Background: light
 # Light color palette {{{
@@ -414,11 +405,11 @@ TermCursorNC         base03            base01
 # Extra stuff (light) {{{
 Include: _extra.colortemplate
 # }}}
-#unlet s:termtrans
+Include: _cleanup.colortemplate
 
 Background: any
 # B&W variant {{{
 Include: _bw.colortemplate
 # }}}
-#unlet s:termtrans
+Include: _cleanup.colortemplate
 

templates/solarized8_low.colortemplate

@@ -3,21 +3,12 @@
 # Information {{{
 Full name:       Solarized 8 Low Contrast
 Short name:      solarized8_low
-Author:          Ethan Schoonover
+Include:        _info.colortemplate
-Maintainer:      Lifepillar <lifepillar@lifepillar.me>
-Website:         https://github.com/lifepillar/vim-solarized8
-Description:     Precision colors for machines and people
-Option Prefix:   solarized
-License:         OSI approved MIT license
-Neovim:          yes
 # }}}
 
-#let s:italics = s:italics && get(g:, '@optionprefix_italics', 1)
+Include: _global.colortemplate
-#let s:termtrans = get(g:, '@optionprefix_termtrans', 0) && !has('gui_running')
 
-Include: _linked_groups.colortemplate
+Variant: gui 256 16
-
-Variant: 256 gui 16
 
 Background: dark
 # Dark color palette {{{
@@ -207,7 +198,7 @@ CommandMode          magenta           base3             reverse
 # Extra stuff (dark) {{{
 Include: _extra.colortemplate
 # }}}
-#unlet s:termtrans
+Include: _cleanup.colortemplate
 
 Background: light
 # Light color palette {{{
@@ -412,11 +403,11 @@ TermCursorNC         base03            base01
 # Extra stuff (light) {{{
 Include: _extra.colortemplate
 # }}}
-#unlet s:termtrans
+Include: _cleanup.colortemplate
 
 Background: any
 # B&W variant {{{
 Include: _bw.colortemplate
 # }}}
-#unlet s:termtrans
+Include: _cleanup.colortemplate