diff --git a/after/plugin/dracula.vim b/after/plugin/dracula.vim
index 1366d97..8a32e27 100644
--- a/after/plugin/dracula.vim
+++ b/after/plugin/dracula.vim
@@ -21,6 +21,16 @@ if exists('g:loaded_fzf') && ! exists('g:fzf_colors')
           \| autocmd BufLeave <buffer> set laststatus=2 showmode ruler
   augroup END
 endif
+"}}}
+" GitGutter: {{{
+
+if exists('g:gitgutter_enabled')
+  hi! link GitGutterAdd DraculaGreen
+  hi! link GitGutterChange DraculaYellow
+  hi! link GitGutterChangeDelete DraculaOrange
+  hi! link GitGutterDelete DraculaRed
+endif
+
 "}}}
 
 " vim: fdm=marker ts=2 sts=2 sw=2:
diff --git a/after/syntax/css.vim b/after/syntax/css.vim
new file mode 100644
index 0000000..ad8f01e
--- /dev/null
+++ b/after/syntax/css.vim
@@ -0,0 +1,15 @@
+if ! exists('b:current_syntax') || b:current_syntax !=# 'css'
+    finish
+endif
+
+hi! link cssAttrComma         Delimiter
+hi! link cssAttrRegion        DraculaPink
+hi! link cssAttributeSelector DraculaGreenItalic
+hi! link cssBraces            Delimiter
+hi! link cssFunctionComma     Delimiter
+hi! link cssNoise             DraculaPink
+hi! link cssProp              DraculaCyan
+hi! link cssPseudoClassId     DraculaGreenItalic
+hi! link cssSelectorOp        Delimiter
+hi! link cssUnitDecorators    DraculaPink
+hi! link cssVendor            DraculaGreenItalic
diff --git a/after/syntax/gitcommit.vim b/after/syntax/gitcommit.vim
new file mode 100644
index 0000000..4959f4e
--- /dev/null
+++ b/after/syntax/gitcommit.vim
@@ -0,0 +1,12 @@
+if ! exists('b:current_syntax') || b:current_syntax !=# 'gitcommit'
+    finish
+endif
+
+" The following two are misnomers. Colors are correct.
+hi! link diffFile    DraculaGreen
+hi! link diffNewFile DraculaRed
+
+hi! link diffAdded   DraculaGreen
+hi! link diffLine    DraculaCyanItalic
+hi! link diffRemoved DraculaRed
+
diff --git a/after/syntax/html.vim b/after/syntax/html.vim
new file mode 100644
index 0000000..b9edef4
--- /dev/null
+++ b/after/syntax/html.vim
@@ -0,0 +1,9 @@
+if ! exists('b:current_syntax') || b:current_syntax !=# 'html'
+    finish
+endif
+
+hi! link htmlTag         DraculaFg
+hi! link htmlArg         DraculaGreenItalic
+hi! link htmlTitle       DraculaFg
+hi! link htmlH1          DraculaFg
+hi! link htmlSpecialChar DraculaPurple
diff --git a/after/syntax/javascript.vim b/after/syntax/javascript.vim
new file mode 100644
index 0000000..ce1f405
--- /dev/null
+++ b/after/syntax/javascript.vim
@@ -0,0 +1,9 @@
+if ! exists('b:current_syntax') || b:current_syntax !=# 'javascript'
+    finish
+endif
+
+hi! link javaScriptBraces   Delimiter
+hi! link javaScriptNumber   Constant
+hi! link javaScriptNull     Constant
+hi! link javaScriptFunction DraculaPink
+
diff --git a/after/syntax/markdown.vim b/after/syntax/markdown.vim
new file mode 100644
index 0000000..d287393
--- /dev/null
+++ b/after/syntax/markdown.vim
@@ -0,0 +1,48 @@
+if ! exists('b:current_syntax')
+  finish
+endif
+
+if b:current_syntax ==# 'mkd'
+  " plasticboy/vim-markdown {{{1
+  hi! link htmlBold       DraculaOrangeBold
+  hi! link htmlBoldItalic DraculaOrangeBoldItalic
+  hi! link htmlH1         DraculaPurpleBold
+  hi! link htmlItalic     DraculaYellowItalic
+  hi! link mkdBlockquote  DraculaYellowItalic
+  hi! link mkdBold        DraculaOrangeBold
+  hi! link mkdBoldItalic  DraculaOrangeBoldItalic
+  hi! link mkdCode        DraculaGreen
+  hi! link mkdCodeEnd     DraculaGreen
+  hi! link mkdCodeStart   DraculaGreen
+  hi! link mkdInlineUrl   DraculaLink
+  hi! link mkdItalic      DraculaYellowItalic
+  hi! link mkdLink        DraculaPink
+  hi! link mkdListItem    DraculaCyan
+  hi! link mkdRule        DraculaComment
+  hi! link mkdUrl         DraculaLink
+  "}}}1
+elseif b:current_syntax ==# 'markdown'
+  " Builtin: {{{1
+  hi! link markdownBlockquote        DraculaCyan
+  hi! link markdownBold              DraculaOrangeBold
+  hi! link markdownBoldItalic        DraculaOrangeBoldItalic
+  hi! link markdownCode              DraculaGreen
+  hi! link markdownCodeDelimiter     DraculaGreen
+  hi! link markdownH1                DraculaPurpleBold
+  hi! link markdownH2                markdownH1
+  hi! link markdownH3                markdownH1
+  hi! link markdownH4                markdownH1
+  hi! link markdownH5                markdownH1
+  hi! link markdownH6                markdownH1
+  hi! link markdownHeadingDelimiter  markdownH1
+  hi! link markdownHeadingRule       markdownH1
+  hi! link markdownItalic            DraculaYellowItalic
+  hi! link markdownLinkText          DraculaPink
+  hi! link markdownListMarker        DraculaCyan
+  hi! link markdownOrderedListMarker DraculaCyan
+  hi! link markdownRule              DraculaComment
+  hi! link markdownUrl               DraculaLink
+  "}}}
+endif
+
+" vim: fdm=marker ts=2 sts=2 sw=2:
diff --git a/after/syntax/php.vim b/after/syntax/php.vim
new file mode 100644
index 0000000..19d86e2
--- /dev/null
+++ b/after/syntax/php.vim
@@ -0,0 +1,9 @@
+if ! exists('b:current_syntax') || b:current_syntax !=# 'php'
+    finish
+endif
+
+hi! link phpClass           Type
+hi! link phpDocTags         DraculaCyanItalic
+hi! link phpFunction        Function
+hi! link phpParent          Normal
+hi! link phpSpecialFunction DraculaCyan
diff --git a/after/syntax/ruby.vim b/after/syntax/ruby.vim
new file mode 100644
index 0000000..1a159ca
--- /dev/null
+++ b/after/syntax/ruby.vim
@@ -0,0 +1,16 @@
+if ! exists('b:current_syntax') || b:current_syntax !=# 'ruby'
+    finish
+endif
+
+if ! exists('g:ruby_operators')
+    let g:ruby_operators=1
+endif
+
+hi! link rubyBlockArgument          DraculaOrangeItalic
+hi! link rubyBlockParameter         DraculaOrangeItalic
+hi! link rubyCurlyBlock             DraculaPink
+hi! link rubyGlobalVariable         DraculaPurple
+hi! link rubyInstanceVariable       DraculaPurpleItalic
+hi! link rubyInterpolationDelimiter DraculaPink
+hi! link rubyRegexpDelimiter        DraculaRed
+hi! link rubyStringDelimiter        DraculaYellow
diff --git a/after/syntax/sass.vim b/after/syntax/sass.vim
new file mode 100644
index 0000000..711f07c
--- /dev/null
+++ b/after/syntax/sass.vim
@@ -0,0 +1,12 @@
+if ! exists('b:current_syntax') || b:current_syntax !=# 'sass'
+    finish
+endif
+
+hi! link sassClass                  cssClassName
+hi! link sassClassChar              cssClassNameDot
+hi! link sassId                     cssIdentifier
+hi! link sassIdChar                 cssIdentifier
+hi! link sassInterpolationDelimiter DraculaPink
+hi! link sassMixinName              Function
+hi! link sassProperty               cssProp
+hi! link sassVariableAssignment     Operator
diff --git a/after/syntax/typescript.vim b/after/syntax/typescript.vim
new file mode 100644
index 0000000..dcb25fc
--- /dev/null
+++ b/after/syntax/typescript.vim
@@ -0,0 +1,41 @@
+if ! exists('b:current_syntax') || b:current_syntax !=# 'typescript'
+    finish
+endif
+
+hi! link typescriptArrayMethod            DraculaCyan
+hi! link typescriptArrowFuncArg           DraculaOrangeItalic
+hi! link typescriptAssign                 Operator
+hi! link typescriptBinaryOp               Operator
+hi! link typescriptBraces                 Normal
+hi! link typescriptCall                   typescriptArrowFuncArg
+hi! link typescriptClassHeritage          Type
+hi! link typescriptClassName              Type
+hi! link typescriptDateMethod             DraculaCyan
+hi! link typescriptDateStaticMethod       Function
+hi! link typescriptDecorator              DraculaGreenItalic
+hi! link typescriptES6SetMethod           DraculaCyan
+hi! link typescriptEndColons              Normal
+hi! link typescriptEnum                   Type
+hi! link typescriptEnumKeyword            Keyword
+hi! link typescriptFuncKeyword            Keyword
+hi! link typescriptGlobal                 Type
+hi! link typescriptGlobalMethod           DraculaCyan
+hi! link typescriptGlobalObjects          Type
+hi! link typescriptIdentifier             Keyword
+hi! link typescriptInterfaceHeritage      Type
+hi! link typescriptInterfaceName          Type
+hi! link typescriptInterpolationDelimiter Keyword
+hi! link typescriptKeywordOp              Keyword
+hi! link typescriptLogicSymbols           Operator
+hi! link typescriptMember                 Normal
+hi! link typescriptMemberOptionality      Special
+hi! link typescriptObjectColon            Special
+hi! link typescriptObjectLabel            Normal
+hi! link typescriptObjectSpread           Operator
+hi! link typescriptOperator               Operator
+hi! link typescriptPredefinedType         Type
+hi! link typescriptTernaryOp              Operator
+hi! link typescriptTypeAnnotation         Special
+hi! link typescriptTypeCast               Operator
+hi! link typescriptUnaryOp                Operator
+hi! link typescriptVariable               Keyword
diff --git a/after/syntax/vim.vim b/after/syntax/vim.vim
new file mode 100644
index 0000000..940ecb6
--- /dev/null
+++ b/after/syntax/vim.vim
@@ -0,0 +1,14 @@
+if ! exists('b:current_syntax') || b:current_syntax !=# 'vim'
+    finish
+endif
+
+hi! link vimAutoCmdSfxList     DraculaCyanItalic
+hi! link vimAutoEventList      DraculaCyanItalic
+hi! link vimEnvVar             DraculaPurple
+hi! link vimFunction           DraculaGreen
+hi! link vimHiBang             DraculaPink
+hi! link vimOption             DraculaCyanItalic
+hi! link vimSetMod             DraculaPink
+hi! link vimSetSep             Delimiter
+hi! link vimUserAttrbCmpltFunc DraculaGreen
+hi! link vimUserFunc           DraculaGreen
diff --git a/after/syntax/yaml.vim b/after/syntax/yaml.vim
new file mode 100644
index 0000000..33f4289
--- /dev/null
+++ b/after/syntax/yaml.vim
@@ -0,0 +1,12 @@
+if ! exists('b:current_syntax') || b:current_syntax !=# 'yaml'
+    finish
+endif
+
+hi! link yamlAlias           DraculaGreenItalicUnderline
+hi! link yamlAnchor          DraculaPinkItalic
+hi! link yamlBlockMappingKey DraculaCyan
+hi! link yamlFlowCollection  DraculaPink
+hi! link yamlFlowIndicator   Delimiter
+hi! link yamlNodeTag         DraculaPink
+hi! link yamlPlainScalar     DraculaYellow
+
diff --git a/colors/dracula.vim b/colors/dracula.vim
index e169d62..a3073ee 100644
--- a/colors/dracula.vim
+++ b/colors/dracula.vim
@@ -157,7 +157,7 @@ function! s:h(scope, fg, ...) " bg, attr_list, special
 endfunction
 
 function! s:Background()
-  if g:dracula_colorterm || has("gui_running")
+  if g:dracula_colorterm || has('gui_running')
     return s:bg
   else
     return s:none
@@ -231,76 +231,53 @@ call s:h('DraculaDiffDelete', s:red, s:bgdark)
 " }}}
 " User Interface: {{{
 
-" Core: {{{2
 set background=dark
+
+" Required as some plugins will overwrite
 call s:h('Normal', s:fg, s:Background())
-
-hi! link Visual DraculaSelection
-hi! link VisualNOS Visual
-hi! link Search DraculaSearch
-hi! link IncSearch DraculaOrangeInverse
-
-" Status / Command Line
 call s:h('StatusLine', s:none, s:bglighter, [s:attrs.bold])
 call s:h('StatusLineNC', s:none, s:bglight)
 call s:h('WildMenu', s:bg, s:purple, [s:attrs.bold])
+call s:h('CursorLine', s:none, s:subtle)
 
-" Tabs
-hi! link TabLine DraculaBoundary
-hi! link TabLineFill DraculaBgDarker
-hi! link TabLineSel Normal
-
-" Popup Menu
-hi! link Pmenu DraculaBgDark
-hi! link PmenuSel DraculaSelection
-hi! link PmenuSbar DraculaBgDark
-hi! link PmenuThumb DraculaSelection
-
-" Messages
-hi! link ErrorMsg DraculaRedInverse
-hi! link WarningMsg DraculaOrangeInverse
-hi! link MoreMsg DraculaFgBold
-hi! link Question DraculaFgBold
-hi! link Title DraculaGreenBold
-
-" Folds
-hi! link Folded DraculaBoundary
-hi! link VertSplit DraculaBoundary
-hi! link FoldColumn DraculaSubtle
-
-" Line Numbers
-hi! link CursorLineNr DraculaYellow
-hi! link LineNr DraculaComment
-hi! link SignColumn DraculaComment
-
-" Whitespace / Non-text
-call s:h('CursorLine', s:none, s:subtle) " Required as some plugins will overwrite
-hi! link NonText DraculaSubtle
+hi! link ColorColumn  DraculaSelection
 hi! link CursorColumn DraculaSelection
-hi! link ColorColumn DraculaSelection
-
-" Diffs
-hi! link DiffAdd DraculaGreen
-hi! link DiffChange DraculaDiffChange
-hi! link DiffText DraculaDiffText
-hi! link DiffDelete DraculaDiffDelete
-
-"}}}2
-" GitGutter: {{{2
-hi! link GitGutterAdd DraculaGreen
-hi! link GitGutterChange DraculaYellow
-hi! link GitGutterChangeDelete DraculaOrange
-hi! link GitGutterDelete DraculaRed
-"}}}2
-" NetRW: {{{2
-
-hi! link Directory DraculaPurpleBold
-
-" }}}2
+hi! link CursorLineNr DraculaYellow
+hi! link DiffAdd      DraculaGreen
+hi! link DiffChange   DraculaDiffChange
+hi! link DiffDelete   DraculaDiffDelete
+hi! link DiffText     DraculaDiffText
+hi! link Directory    DraculaPurpleBold
+hi! link ErrorMsg     DraculaRedInverse
+hi! link FoldColumn   DraculaSubtle
+hi! link Folded       DraculaBoundary
+hi! link IncSearch    DraculaOrangeInverse
+hi! link LineNr       DraculaComment
+hi! link MoreMsg      DraculaFgBold
+hi! link NonText      DraculaSubtle
+hi! link Pmenu        DraculaBgDark
+hi! link PmenuSbar    DraculaBgDark
+hi! link PmenuSel     DraculaSelection
+hi! link PmenuThumb   DraculaSelection
+hi! link Question     DraculaFgBold
+hi! link Search       DraculaSearch
+hi! link SignColumn   DraculaComment
+hi! link TabLine      DraculaBoundary
+hi! link TabLineFill  DraculaBgDarker
+hi! link TabLineSel   Normal
+hi! link Title        DraculaGreenBold
+hi! link VertSplit    DraculaBoundary
+hi! link Visual       DraculaSelection
+hi! link VisualNOS    Visual
+hi! link WarningMsg   DraculaOrangeInverse
 
 " }}}
 " Syntax: {{{
 
+" Required as some plugins will overwrite
+call s:h('MatchParen', s:fg, s:pink, [s:attrs.underline])
+call s:h('Conceal', s:comment, s:bglight)
+
 hi! link Comment DraculaComment
 hi! link Underlined DraculaFgUnderline
 hi! link Todo DraculaTodo
@@ -350,135 +327,6 @@ hi! link helpHyperTextJump DraculaLink
 hi! link helpCommand DraculaPurple
 hi! link helpExample DraculaGreen
 
-call s:h('MatchParen', s:fg, s:pink, [s:attrs.underline])
-call s:h('Conceal', s:comment, s:bglight)
-
-" CSS: {{{2
-
-hi! link cssAttrComma Delimiter
-hi! link cssBraces Delimiter
-hi! link cssSelectorOp Delimiter
-hi! link cssFunctionComma Delimiter
-hi! link cssAttributeSelector DraculaGreenItalic
-hi! link cssVendor DraculaGreenItalic
-hi! link cssAttrRegion DraculaPink
-hi! link cssUnitDecorators DraculaPink
-hi! link cssProp DraculaCyan
-hi! link cssPseudoClassId DraculaGreenItalic
-hi! link cssNoise DraculaPink
-
-"}}}2
-" Git Commit: {{{2
-
-" These groups appear when editing commit messages.
-" They are not part of the Diff interface of vim diff
-
-" The following two are misnomers. Colors are correct.
-hi! link diffFile DraculaGreen
-hi! link diffNewFile DraculaRed
-
-hi! link diffLine DraculaCyanItalic
-hi! link diffRemoved DraculaRed
-hi! link diffAdded DraculaGreen
-
-"}}}2
-" HTML: {{{2
-
-hi! link htmlTag DraculaFg
-hi! link htmlArg DraculaGreenItalic
-hi! link htmlTitle DraculaFg
-hi! link htmlH1 DraculaFg
-hi! link htmlSpecialChar DraculaPurple
-
-"}}}2
-" JavaScript: {{{2
-
-hi! link javaScriptBraces Delimiter
-hi! link javaScriptNumber Constant
-hi! link javaScriptNull Constant
-hi! link javaScriptFunction DraculaPink
-
-"}}}2
-" Markdown: {{{2
-
-hi! link markdownH1 DraculaPurpleBold
-hi! link markdownH2 markdownH1
-hi! link markdownH3 markdownH1
-hi! link markdownH4 markdownH1
-hi! link markdownH5 markdownH1
-hi! link markdownH6 markdownH1
-hi! link markdownHeadingDelimiter markdownH1
-hi! link markdownHeadingRule markdownH1
-
-hi! link markdownBold DraculaOrangeBold
-hi! link markdownItalic DraculaYellowItalic
-hi! link markdownBoldItalic DraculaOrangeBoldItalic
-
-hi! link markdownBlockquote DraculaCyan
-
-hi! link markdownCode DraculaGreen
-hi! link markdownCodeDelimiter DraculaGreen
-
-hi! link markdownListMarker DraculaCyan
-hi! link markdownOrderedListMarker DraculaCyan
-
-hi! link markdownRule DraculaComment
-
-hi! link markdownLinkText DraculaPink
-hi! link markdownUrl DraculaLink
-
-"}}}2
-" Ruby: {{{2
-
-let g:ruby_operators=1
-hi! link rubyStringDelimiter DraculaYellow
-hi! link rubyInterpolationDelimiter DraculaPink
-hi! link rubyCurlyBlock DraculaPink
-hi! link rubyBlockParameter DraculaOrangeItalic
-hi! link rubyBlockArgument DraculaOrangeItalic
-hi! link rubyInstanceVariable DraculaPurpleItalic
-hi! link rubyGlobalVariable DraculaPurple
-hi! link rubyRegexpDelimiter DraculaRed
-
-"}}}2
-" Sass: {{{2
-
-hi! link sassProperty cssProp
-hi! link sassMixinName Function
-hi! link sassClass cssClassName
-hi! link sassClassChar cssClassNameDot
-hi! link sassInterpolationDelimiter DraculaPink
-hi! link sassVariableAssignment Operator
-hi! link sassId cssIdentifier
-hi! link sassIdChar cssIdentifier
-
-"}}}2
-" Vim Script: {{{2
-
-hi! link vimOption DraculaCyanItalic
-hi! link vimAutoEventList DraculaCyanItalic
-hi! link vimAutoCmdSfxList DraculaCyanItalic
-hi! link vimSetSep Delimiter
-hi! link vimSetMod DraculaPink
-hi! link vimHiBang DraculaPink
-hi! link vimEnvVar DraculaPurple
-hi! link vimUserFunc DraculaGreen
-hi! link vimFunction DraculaGreen
-hi! link vimUserAttrbCmpltFunc DraculaGreen
-
-"}}}2
-" YAML: {{{2
-
-hi! link yamlBlockMappingKey DraculaCyan
-hi! link yamlPlainScalar DraculaYellow
-hi! link yamlAnchor DraculaPinkItalic
-hi! link yamlAlias DraculaGreenItalicUnderline
-hi! link yamlNodeTag DraculaPink
-hi! link yamlFlowCollection DraculaPink
-hi! link yamlFlowIndicator Delimiter
-
-"}}}2
-
 "}}}
 
 " vim: fdm=marker ts=2 sts=2 sw=2:
diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
deleted file mode 100644
index e33908a..0000000
--- a/ftplugin/markdown.vim
+++ /dev/null
@@ -1,30 +0,0 @@
-" plasticboy/vim-markdown {{{1
-
-hi! link htmlH1 DraculaPurpleBold
-
-hi! link htmlItalic DraculaYellowItalic
-hi! link mkdItalic DraculaYellowItalic
-
-hi! link htmlBold DraculaOrangeBold
-hi! link mkdBold DraculaOrangeBold
-
-hi! link htmlBoldItalic DraculaOrangeBoldItalic
-hi! link mkdBoldItalic DraculaOrangeBoldItalic
-
-hi! link mkdRule DraculaComment
-
-hi! link mkdBlockquote DraculaYellowItalic
-
-hi! link mkdListItem DraculaCyan
-
-hi! link mkdCode DraculaGreen
-hi! link mkdCodeStart DraculaGreen
-hi! link mkdCodeEnd DraculaGreen
-
-hi! link mkdLink DraculaPink
-hi! link mkdUrl DraculaLink
-hi! link mkdInlineUrl DraculaLink
-
-"}}}1
-
-" vim: fdm=marker ts=2 sts=2 sw=2: