diff --git a/init.lua b/init.lua
index 34bca38..a596786 100644
--- a/init.lua
+++ b/init.lua
@@ -2,4 +2,5 @@
 require('settings')
 require('keybinds')
 require('plugins')
+require('autocommands')
 
diff --git a/lua/autocommands.lua b/lua/autocommands.lua
new file mode 100644
index 0000000..05a40db
--- /dev/null
+++ b/lua/autocommands.lua
@@ -0,0 +1,18 @@
+
+-- For some reason, setting the color scheme has to be in an autocommand
+vim.cmd([[
+	augroup MichaelColorScheme
+	autocmd!
+	autocmd VimEnter * colorscheme darkplus
+	augroup end
+]])
+
+-- For some reason, the setup function isn't calling this... It might be because we are setting the color
+-- scheme through an autocommand too
+vim.cmd([[
+	augroup NvimWebDeviconsColorFix
+	autocmd!
+	autocmd VimEnter * lua require'nvim-web-devicons'.set_up_highlights()
+	augroup end
+]])
+
diff --git a/lua/plugins.lua b/lua/plugins.lua
index c78a704..f2da34b 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -22,10 +22,6 @@ packer.startup {
 		use { 'nathom/filetype.nvim', config = function() vim.g.did_load_filetypes = 1 end }
 
 		-- General Assets/Resources
-		-- TODO: Currently, you have to run :PackerSync in order to get the colors working...
-		-- Actually was :PackerCompile.
-		-- This makes me think there was just a dependency problem somewhere here...
-		-- Now, the config may be bjorked
 		use { 'kyazdani42/nvim-web-devicons', config = function() require'configs.icons'.config() end }
 
 		--
@@ -110,11 +106,3 @@ packer.startup {
 	}
 }
 
--- For some reason, setting the color scheme has to be in an autocommand
-vim.cmd([[
-	augroup colorscheme
-	autocmd!
-	autocmd VimEnter * colorscheme darkplus
-	augroup end
-]])
-