diff --git a/.vim/colors/hybrid-light.vim b/.vim/colors/hybrid-light.vim
index a4c81f8..9151a92 100644
--- a/.vim/colors/hybrid-light.vim
+++ b/.vim/colors/hybrid-light.vim
@@ -1,867 +1,328 @@
-
-
-
-
-
-
-
-
- vim-hybrid/colors/hybrid-light.vim at master · w0ng/vim-hybrid · GitHub
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Something went wrong with that request. Please try again.
-
-
-
-
-
+" File: hybrid-light.vim
+" Maintainer: Andrew Wong (w0ng)
+" URL: https://github.com/w0ng/vim-hybrid
+" Modified: 27 Jan 2013 06:05 AM AEST
+" License: MIT
+
+" Description:"{{{
+" ----------------------------------------------------------------------------
+" A clone of Solarized light with a custom colour palette. Currently a WIP.
+
+"}}}
+" Initialisation:"{{{
+" ----------------------------------------------------------------------------
+if !has("gui_running") && &t_Co < 256
+ finish
+endif
+
+set background=light
+hi clear
+
+if exists("syntax_on")
+ syntax reset
+endif
+
+let colors_name = "hybrid-light"
+
+"}}}
+" GUI And Cterm Palettes:"{{{
+" ----------------------------------------------------------------------------
+if has("gui_running")
+ let s:vmode = "gui"
+ let s:background = "#e4e4e4"
+ let s:foreground = "#000000"
+ let s:selection = "#bcbcbc"
+ let s:line = "#d0d0d0"
+ let s:comment = "#5f5f5f"
+ let s:red = "#5f0000"
+ let s:orange = "#875f00"
+ let s:yellow = "#5f5f00"
+ let s:green = "#005f00"
+ let s:aqua = "#005f5f"
+ let s:blue = "#00005f"
+ let s:purple = "#5f005f"
+ let s:window = "#9e9e9e"
+ let s:darkcolumn = "#808080"
+ let s:addbg = "#d7ffd7"
+ let s:changebg = "#d7d7ff"
+ let s:delbg = "#ffd7d7"
+else
+ let s:vmode = "cterm"
+ let s:background = "254"
+ let s:foreground = "16"
+ let s:selection = "250"
+ let s:line = "252"
+ let s:comment = "59"
+ let s:red = "52"
+ let s:orange = "94"
+ let s:yellow = "58"
+ let s:green = "22"
+ let s:aqua = "23"
+ let s:blue = "17"
+ let s:purple = "53"
+ let s:window = "247"
+ let s:darkcolumn = "244"
+ let s:addbg = "194"
+ let s:changebg = "189"
+ let s:delbg = "224"
+endif
+
+"}}}
+" Formatting Options:"{{{
+" ----------------------------------------------------------------------------
+let s:none = "NONE"
+let s:t_none = "NONE"
+let s:n = "NONE"
+let s:c = ",undercurl"
+let s:r = ",reverse"
+let s:s = ",standout"
+let s:b = ",bold"
+let s:u = ",underline"
+let s:i = ",italic"
+
+"}}}
+" Highlighting Primitives:"{{{
+" ----------------------------------------------------------------------------
+exe "let s:bg_none = ' ".s:vmode."bg=".s:none ."'"
+exe "let s:bg_foreground = ' ".s:vmode."bg=".s:foreground."'"
+exe "let s:bg_background = ' ".s:vmode."bg=".s:background."'"
+exe "let s:bg_selection = ' ".s:vmode."bg=".s:selection ."'"
+exe "let s:bg_line = ' ".s:vmode."bg=".s:line ."'"
+exe "let s:bg_comment = ' ".s:vmode."bg=".s:comment ."'"
+exe "let s:bg_red = ' ".s:vmode."bg=".s:red ."'"
+exe "let s:bg_orange = ' ".s:vmode."bg=".s:orange ."'"
+exe "let s:bg_yellow = ' ".s:vmode."bg=".s:yellow ."'"
+exe "let s:bg_green = ' ".s:vmode."bg=".s:green ."'"
+exe "let s:bg_aqua = ' ".s:vmode."bg=".s:aqua ."'"
+exe "let s:bg_blue = ' ".s:vmode."bg=".s:blue ."'"
+exe "let s:bg_purple = ' ".s:vmode."bg=".s:purple ."'"
+exe "let s:bg_window = ' ".s:vmode."bg=".s:window ."'"
+exe "let s:bg_darkcolumn = ' ".s:vmode."bg=".s:darkcolumn."'"
+exe "let s:bg_addbg = ' ".s:vmode."bg=".s:addbg ."'"
+exe "let s:bg_changebg = ' ".s:vmode."bg=".s:changebg ."'"
+exe "let s:bg_delbg = ' ".s:vmode."bg=".s:delbg ."'"
+
+exe "let s:fg_none = ' ".s:vmode."fg=".s:none ."'"
+exe "let s:fg_foreground = ' ".s:vmode."fg=".s:foreground."'"
+exe "let s:fg_background = ' ".s:vmode."fg=".s:background."'"
+exe "let s:fg_selection = ' ".s:vmode."fg=".s:selection ."'"
+exe "let s:fg_line = ' ".s:vmode."fg=".s:line ."'"
+exe "let s:fg_comment = ' ".s:vmode."fg=".s:comment ."'"
+exe "let s:fg_red = ' ".s:vmode."fg=".s:red ."'"
+exe "let s:fg_orange = ' ".s:vmode."fg=".s:orange ."'"
+exe "let s:fg_yellow = ' ".s:vmode."fg=".s:yellow ."'"
+exe "let s:fg_green = ' ".s:vmode."fg=".s:green ."'"
+exe "let s:fg_aqua = ' ".s:vmode."fg=".s:aqua ."'"
+exe "let s:fg_blue = ' ".s:vmode."fg=".s:blue ."'"
+exe "let s:fg_purple = ' ".s:vmode."fg=".s:purple ."'"
+exe "let s:fg_window = ' ".s:vmode."fg=".s:window ."'"
+exe "let s:fg_darkcolumn = ' ".s:vmode."fg=".s:darkcolumn."'"
+exe "let s:fg_addbg = ' ".s:vmode."fg=".s:addbg ."'"
+exe "let s:fg_changebg = ' ".s:vmode."fg=".s:changebg ."'"
+exe "let s:fg_delbg = ' ".s:vmode."fg=".s:delbg ."'"
+
+exe "let s:fmt_none = ' ".s:vmode."=NONE". " term=NONE" ."'"
+exe "let s:fmt_bold = ' ".s:vmode."=NONE".s:b. " term=NONE".s:b ."'"
+exe "let s:fmt_bldi = ' ".s:vmode."=NONE".s:b. " term=NONE".s:b ."'"
+exe "let s:fmt_undr = ' ".s:vmode."=NONE".s:u. " term=NONE".s:u ."'"
+exe "let s:fmt_undb = ' ".s:vmode."=NONE".s:u.s:b. " term=NONE".s:u.s:b."'"
+exe "let s:fmt_undi = ' ".s:vmode."=NONE".s:u. " term=NONE".s:u ."'"
+exe "let s:fmt_curl = ' ".s:vmode."=NONE".s:c. " term=NONE".s:c ."'"
+exe "let s:fmt_ital = ' ".s:vmode."=NONE".s:i. " term=NONE".s:i ."'"
+exe "let s:fmt_stnd = ' ".s:vmode."=NONE".s:s. " term=NONE".s:s ."'"
+exe "let s:fmt_revr = ' ".s:vmode."=NONE".s:r. " term=NONE".s:r ."'"
+exe "let s:fmt_revb = ' ".s:vmode."=NONE".s:r.s:b. " term=NONE".s:r.s:b."'"
+
+if has("gui_running")
+ exe "let s:sp_none = ' guisp=".s:none ."'"
+ exe "let s:sp_foreground = ' guisp=".s:foreground."'"
+ exe "let s:sp_background = ' guisp=".s:background."'"
+ exe "let s:sp_selection = ' guisp=".s:selection ."'"
+ exe "let s:sp_line = ' guisp=".s:line ."'"
+ exe "let s:sp_comment = ' guisp=".s:comment ."'"
+ exe "let s:sp_red = ' guisp=".s:red ."'"
+ exe "let s:sp_orange = ' guisp=".s:orange ."'"
+ exe "let s:sp_yellow = ' guisp=".s:yellow ."'"
+ exe "let s:sp_green = ' guisp=".s:green ."'"
+ exe "let s:sp_aqua = ' guisp=".s:aqua ."'"
+ exe "let s:sp_blue = ' guisp=".s:blue ."'"
+ exe "let s:sp_purple = ' guisp=".s:purple ."'"
+ exe "let s:sp_window = ' guisp=".s:window ."'"
+ exe "let s:sp_addbg = ' guisp=".s:addbg ."'"
+ exe "let s:sp_changebg = ' guisp=".s:changebg ."'"
+ exe "let s:sp_delbg = ' guisp=".s:delbg ."'"
+else
+ let s:sp_none = ""
+ let s:sp_foreground = ""
+ let s:sp_background = ""
+ let s:sp_selection = ""
+ let s:sp_line = ""
+ let s:sp_comment = ""
+ let s:sp_red = ""
+ let s:sp_orange = ""
+ let s:sp_yellow = ""
+ let s:sp_green = ""
+ let s:sp_aqua = ""
+ let s:sp_blue = ""
+ let s:sp_purple = ""
+ let s:sp_window = ""
+ let s:sp_addbg = ""
+ let s:sp_changebg = ""
+ let s:sp_delbg = ""
+endif
+
+"}}}
+" Vim Highlighting: (see :help highlight-groups)"{{{
+" ----------------------------------------------------------------------------
+exe "hi! ColorColumn" .s:fg_none .s:bg_line .s:fmt_none
+" Conceal"
+" Cursor"
+" CursorIM"
+exe "hi! CursorColumn" .s:fg_none .s:bg_line .s:fmt_none
+exe "hi! CursorLine" .s:fg_none .s:bg_line .s:fmt_none
+exe "hi! Directory" .s:fg_blue .s:bg_none .s:fmt_none
+exe "hi! DiffAdd" .s:fg_green .s:bg_addbg .s:fmt_none
+exe "hi! DiffChange" .s:fg_purple .s:bg_changebg .s:fmt_none
+exe "hi! DiffDelete" .s:fg_red .s:bg_delbg .s:fmt_none
+exe "hi! DiffText" .s:fg_background .s:bg_purple .s:fmt_none
+exe "hi! ErrorMsg" .s:fg_background .s:bg_red .s:fmt_stnd
+exe "hi! VertSplit" .s:fg_window .s:bg_none .s:fmt_none
+exe "hi! Folded" .s:fg_background .s:bg_darkcolumn .s:fmt_none
+exe "hi! FoldColumn" .s:fg_none .s:bg_darkcolumn .s:fmt_none
+exe "hi! SignColumn" .s:fg_none .s:bg_darkcolumn .s:fmt_none
+" Incsearch"
+exe "hi! LineNr" .s:fg_comment .s:bg_line .s:fmt_none
+exe "hi! CursorLineNr" .s:fg_orange .s:bg_none .s:fmt_bold
+exe "hi! MatchParen" .s:fg_background .s:bg_aqua .s:fmt_none
+exe "hi! ModeMsg" .s:fg_green .s:bg_none .s:fmt_none
+exe "hi! MoreMsg" .s:fg_green .s:bg_none .s:fmt_none
+exe "hi! NonText" .s:fg_selection .s:bg_none .s:fmt_none
+exe "hi! Normal" .s:fg_foreground .s:bg_background .s:fmt_none
+exe "hi! Pmenu" .s:fg_foreground .s:bg_selection .s:fmt_none
+exe "hi! PmenuSel" .s:fg_foreground .s:bg_selection .s:fmt_revr
+" PmenuSbar"
+" PmenuThumb"
+exe "hi! Question" .s:fg_green .s:bg_none .s:fmt_none
+exe "hi! Search" .s:fg_background .s:bg_yellow .s:fmt_none
+exe "hi! SpecialKey" .s:fg_selection .s:bg_none .s:fmt_none
+exe "hi! SpellBad" .s:fg_red .s:bg_none .s:fmt_undr
+exe "hi! SpellCap" .s:fg_blue .s:bg_none .s:fmt_undr
+exe "hi! SpellLocal" .s:fg_aqua .s:bg_none .s:fmt_undr
+exe "hi! SpellRare" .s:fg_purple .s:bg_none .s:fmt_undr
+exe "hi! StatusLine" .s:fg_comment .s:bg_background .s:fmt_revr
+exe "hi! StatusLineNC" .s:fg_window .s:bg_foreground .s:fmt_revr
+exe "hi! TabLine" .s:fg_foreground .s:bg_darkcolumn .s:fmt_revr
+" TabLineFill"
+" TabLineSel"
+exe "hi! Title" .s:fg_yellow .s:bg_none .s:fmt_none
+exe "hi! Visual" .s:fg_none .s:bg_selection .s:fmt_none
+" VisualNos"
+exe "hi! WarningMsg" .s:fg_red .s:bg_none .s:fmt_none
+" WildMenu"
+
+"}}}
+" Generic Syntax Highlighting: (see :help group-name)"{{{
+" ----------------------------------------------------------------------------
+exe "hi! Comment" .s:fg_comment .s:bg_none .s:fmt_none
+
+exe "hi! Constant" .s:fg_aqua .s:bg_none .s:fmt_none
+"exe "hi! String" .s:fg_green .s:bg_none .s:fmt_none
+" Character"
+" Number"
+" Boolean"
+" Float"
+
+exe "hi! Identifier" .s:fg_blue .s:bg_none .s:fmt_none
+"exe "hi! Function" .s:fg_yellow .s:bg_none .s:fmt_none
+
+exe "hi! Statement" .s:fg_green .s:bg_none .s:fmt_none
+" Conditional"
+" Repeat"
+" Label"
+"exe "hi! Operator" .s:fg_foreground .s:bg_none .s:fmt_none
+" Keyword"
+" Exception"
+
+exe "hi! PreProc" .s:fg_orange .s:bg_none .s:fmt_none
+" Include"
+" Define"
+" Macro"
+" PreCondit"
+
+exe "hi! Type" .s:fg_yellow .s:bg_none .s:fmt_none
+" StorageClass"
+"exe "hi! Structure" .s:fg_aqua .s:bg_none .s:fmt_none
+" Typedef"
+
+exe "hi! Special" .s:fg_red .s:bg_none .s:fmt_none
+" SpecialChar"
+" Tag"
+" Delimiter"
+" SpecialComment"
+" Debug"
+"
+exe "hi! Underlined" .s:fg_purple .s:bg_none .s:fmt_none
+
+exe "hi! Ignore" .s:fg_none .s:bg_none .s:fmt_none
+
+exe "hi! Error" .s:fg_red .s:bg_none .s:fmt_undr
+
+exe "hi! Todo" .s:fg_comment .s:bg_addbg .s:fmt_none
+
+" Quickfix window
+exe "hi! qfLineNr" .s:fg_yellow .s:bg_none .s:fmt_none
+" qfFileName"
+" qfLineNr"
+" qfError"
+
+"}}}
+" Diff Syntax Highlighting:"{{{
+" ----------------------------------------------------------------------------
+" Diff
+" diffOldFile
+" diffNewFile
+" diffFile
+" diffOnly
+" diffIdentical
+" diffDiffer
+" diffBDiffer
+" diffIsA
+" diffNoEOL
+" diffCommon
+hi! link diffRemoved Special
+" diffChanged
+hi! link diffAdded Statement
+" diffLine
+" diffSubname
+" diffComment
+
+"}}}
+" Legal:"{{{
+" ----------------------------------------------------------------------------
+" Copyright (c) 2011 Ethan Schoonover
+" Copyright (c) 2013 w0ng
+"
+" Permission is hereby granted, free of charge, to any per‐
+" son obtaining a copy of this software and associated doc‐
+" umentation files (the “Software”), to deal in the Soft‐
+" ware without restriction, including without limitation
+" the rights to use, copy, modify, merge, publish, distrib‐
+" ute, 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 PARTICU‐
+" LAR 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 CON‐
+" TRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON‐
+" NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+" THE SOFTWARE.
+
+" }}}