diff --git a/after/queries/css/highlights.scm b/after/queries/css/highlights.scm
deleted file mode 100644
index 7fa2000..0000000
--- a/after/queries/css/highlights.scm
+++ /dev/null
@@ -1,18 +0,0 @@
-(id_selector (id_name) @CssIdentifier)
-(id_selector (id_name)) @CssIdSelector
-(tag_name) @HtmlTagName
-
-(class_selector (class_name) @CssClassName)
-(selectors (pseudo_class_selector (class_name) @cssPseudoClass))
-(nesting_selector) @cssNestingSelector
-
-; need to find out how to make this more specific?
-(universal_selector) @CssUniversalSelector
-
-((property_name) (_)) @CssProp
-
-(unit) @CssUnit
-
-(declaration (property_name) (_) @CssPropertyValue)
-
-(media_statement (feature_query (feature_name) @cssMediaFeatureName (_ (unit) @cssMediaQueryValueUnit) @cssMediaQueryValue) @cssMediaQuery)
diff --git a/after/queries/ecma/highlights.scm b/after/queries/ecma/highlights.scm
deleted file mode 100644
index e69de29..0000000
diff --git a/after/queries/html/highlights.scm b/after/queries/html/highlights.scm
deleted file mode 100644
index 2b752d4..0000000
--- a/after/queries/html/highlights.scm
+++ /dev/null
@@ -1,17 +0,0 @@
-(start_tag
-	(attribute
-		(attribute_name) @ClassNameAttribute (#eq? @ClassNameAttribute "class")
-		(quoted_attribute_value
-			(attribute_value) @CssClassName )))
-
-(start_tag
-	(attribute
-		(attribute_name) @IdAttribute (#eq? @IdAttribute "id")
-		(quoted_attribute_value
-			(attribute_value) @CssIdentifier )))
-
-(start_tag
-	(attribute
-		(attribute_name) @DataAttribute (#match? @DataAttribute "^data-")
-		(quoted_attribute_value
-			(attribute_value) @DataAttributeValue )))
diff --git a/init.commands.vim b/init.commands.vim
deleted file mode 100644
index 418e83d..0000000
--- a/init.commands.vim
+++ /dev/null
@@ -1,27 +0,0 @@
-"   SpacesToTabs  {{{
-" TODO - ake a proper regex substitution
-function! s:spacestotabs()
-	%s/^            /						/e
-	%s/^          /					/e
-	%s/^        /				/e
-	%s/^      /			/e
-	%s/^    /		/e
-	%s/^  /	/e
-endfunction
-command SpacesToTabs call s:spacestotabs()
-
-
-"}}}
-"   TrimWhitespace  {{{
-command! -range=% TrimWhitespace let b:wv = winsaveview() |
-			\ keeppattern <line1>,<line2>s/\s\+$// |
-			\ call winrestview(b:wv)
-
-
-"}}}
-"   Scratch, ScratchVertical  {{{
-command! Scratch new | setlocal buftype=nofile | setlocal bufhidden=hide | setlocal noswapfile
-command! ScratchVertical vnew | setlocal buftype=nofile | setlocal bufhidden=hide | setlocal noswapfile
-"}}}
-"
-"
diff --git a/init.vim b/init.vim
index 3c751b8..38450e0 100644
--- a/init.vim
+++ b/init.vim
@@ -8,7 +8,6 @@ source ~/.config/nvim/init.plugins.vim
 source ~/.config/nvim/init.tabline.vim
 source ~/.config/nvim/init.auto-window.vim
 source ~/.config/nvim/init.fold-text.vim
-source ~/.config/nvim/init.commands.vim
 
 " TODO - maybe separate some of these into own files too
 " #functions {{{
@@ -181,6 +180,17 @@ function! ToggleHighlights() abort "{{{
 endfunction
 "}}}
 "----------------------------------------------------------------------------}}}
+"#commands{{{
+"   TrimWhitespace{{{
+command! -range=% TrimWhitespace let b:wv = winsaveview() |
+			\ keeppattern <line1>,<line2>s/\s\+$// |
+			\ call winrestview(b:wv)
+"}}}
+"   Scratch, ScratchVertical{{{
+command! Scratch new | setlocal buftype=nofile | setlocal bufhidden=hide | setlocal noswapfile
+command! ScratchVertical vnew | setlocal buftype=nofile | setlocal bufhidden=hide | setlocal noswapfile
+"}}}
+"}}}
 " #settings {{{
 
 scriptencoding utf-8
diff --git a/lua/init-plugins.lua b/lua/init-plugins.lua
index 6fd76b3..562c7af 100644
--- a/lua/init-plugins.lua
+++ b/lua/init-plugins.lua
@@ -130,18 +130,18 @@ local on_attach = function(client, bufnr)
   buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
   buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
   buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
-  buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
-  buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
-  buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
-  buf_set_keymap('n', '<space>l', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
-  buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
-  buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
-  buf_set_keymap('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
-  buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
-  buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
   -- buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
   -- buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
   -- buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
+  buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
+  buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
+  buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
+  buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
+  buf_set_keymap('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
+  buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
+  buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
+  buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
+  buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
 
 end