diff --git a/home/.config/nvim/lua/pluginmanager.lua b/home/.config/nvim/lua/pluginmanager.lua
index 3f49f2e..16825fa 100644
--- a/home/.config/nvim/lua/pluginmanager.lua
+++ b/home/.config/nvim/lua/pluginmanager.lua
@@ -112,6 +112,9 @@ require('packer').startup(function()
     -- Vim <3 Asciidoctor
     use 'habamax/vim-asciidoctor'
 
+	-- Modern filetype.vim replacement
+	use("nathom/filetype.nvim")
+
 end)
 
 -- Install plugins if packer was not installed
diff --git a/home/.config/nvim/lua/settings.lua b/home/.config/nvim/lua/settings.lua
index 9a78309..8ff3474 100644
--- a/home/.config/nvim/lua/settings.lua
+++ b/home/.config/nvim/lua/settings.lua
@@ -48,10 +48,6 @@ o.splitright = true
 o.ignorecase = true
 o.smartcase = true
 
--- Enable filetype.lua
-g.do_filetype_lua = 1
-g.did_load_filetypes = 0
-
 -- Use mouse
 o.mouse = 'a'