diff --git a/roles/nvim/files/init_pc.lua b/roles/nvim/files/init_pc.lua
index 4a900c6..36d205c 100644
--- a/roles/nvim/files/init_pc.lua
+++ b/roles/nvim/files/init_pc.lua
@@ -32,7 +32,6 @@ require('packer').startup(function()
     'nvim-treesitter/nvim-treesitter', -- Syntax Highlighting
     run = ':TSUpdate'
   }
-  use 'tpope/vim-commentary' -- Commentary
   use 'tpope/vim-surround' -- Surrounding
   use 'tpope/vim-repeat' -- Repeat Surrounding
   use 'tpope/vim-sleuth' -- Detect Spacing
@@ -58,7 +57,6 @@ require("zenburn").setup()
 
 vim.g.mapleader = ","
 opt.mouse = "nv"
-opt.pastetoggle = "ZP"
 
 opt.number = true
 opt.relativenumber = true
@@ -119,7 +117,7 @@ _G.enable_spell = function(lang)
     print("spellcheck disabled")
   end
 
-  return vim.api.nvim_replace_termcodes('<cr>', true, true, true)
+  -- return vim.api.nvim_replace_termcodes('<cr>', true, true, true)
 end
 
 map('n', 'ZD', 'v:lua.enable_spell("de")', { expr = true, silent = true })
@@ -193,7 +191,6 @@ lsp.lua_ls.setup {
 }
 
 -- Autopairs
-require 'nvim-ts-autotag'.setup()
 require 'nvim-autopairs'.setup {}
 
 -- Snippets
@@ -217,7 +214,7 @@ ls.config.set_config({
   },
 })
 
-require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/lua/snippets" })
+require("luasnip.loaders.from_lua").load({ paths = { "~/.config/nvim/lua/snippets" } })
 
 -- Completion
 local cmp = require('cmp')
@@ -289,7 +286,8 @@ require('nvim-treesitter.configs').setup {
     additional_vim_regex_highlighting = false,
   },
   autotag = {
-    enable = true
+    enable = true,
+    filetypes = { 'html', 'htmldjango', 'xml', 'javascript', 'typescript', 'javascriptreact', 'typescriptreact', 'svelte', 'vue' }
   }
 }
 
@@ -439,4 +437,4 @@ require("auto-session").setup {
   log_level = "error"
 }
 
-opt.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
+-- opt.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal"