diff --git a/nvim/lua/install-plugins.lua b/nvim/lua/install-plugins.lua
index 16e94ae..02f146e 100644
--- a/nvim/lua/install-plugins.lua
+++ b/nvim/lua/install-plugins.lua
@@ -29,7 +29,7 @@ plug(tostring(os.getenv("HOME")) .. '/.vim/plugged', {
   -- prettier
   {'prettier/vim-prettier', ['do'] = 'yarn install --frozen-lockfile --production' },
   -- test plugin
-  'vim-test/vim-test',
+  'nvim-neotest/neotest',
   -- treesitter & extensions
   {'nvim-treesitter/nvim-treesitter', ['do'] = ':TSUpdate'},
   'windwp/nvim-ts-autotag',
@@ -67,7 +67,7 @@ plug(tostring(os.getenv("HOME")) .. '/.vim/plugged', {
   -- also git blamer
   'lewis6991/gitsigns.nvim',
   -- commenter
-  'preservim/nerdcommenter',
+  'tpope/vim-commentary',
   -- Insert or delete brackets, parens, quotes in pair.
   'jiangmiao/auto-pairs',
   -- crab looking tool. looking for what you do shortly before
@@ -76,8 +76,8 @@ plug(tostring(os.getenv("HOME")) .. '/.vim/plugged', {
   'vuciv/vim-bujo',
   -- icons pack
   'kyazdani42/nvim-web-devicons',
-  -- Presentation
-  'junegunn/goyo.vim',
+  -- distraction-free
+  'Pocco81/TrueZen.nvim',
   'junegunn/limelight.vim',
   -- firenvim
   {'glacambre/firenvim', ['do'] = function(_) vim.fn['firenvim#install'](69) end},
diff --git a/nvim/lua/plugins/coc-nvim/functions.lua b/nvim/lua/plugins/coc-nvim/functions.lua
index f84f4e0..4a45860 100644
--- a/nvim/lua/plugins/coc-nvim/functions.lua
+++ b/nvim/lua/plugins/coc-nvim/functions.lua
@@ -24,6 +24,7 @@ function _G.statusline()
     local filepath = '%f'
     local align_section = '%='
     local percentage_through_file = '%p%%'
+
     return string.format(
         '%s%s%s',
         filepath,
diff --git a/nvim/lua/plugins/firenvim/variables.lua b/nvim/lua/plugins/firenvim/variables.lua
index 418f3b3..02327c4 100644
--- a/nvim/lua/plugins/firenvim/variables.lua
+++ b/nvim/lua/plugins/firenvim/variables.lua
@@ -1,21 +1,21 @@
 Variable.g({
-    firenvim_config = {
-      ['globalSettings'] = { ['alt'] = 'all' },
-      ['localSettings'] = {
-          ['.*'] = {
-              ['cmdline'] = 'neovim',
-              ['priority'] = 0,
-              ['selector'] = 'textarea',
-              ['takeover'] = 'always',
-          },
-          ['https?://translate.google.com/.*'] = { ['takeover'] = 'never', ['priority'] = 1 },
-          ['https://studio.youtube.com.*'] = { ['takeover'] = 'never', ['priority'] = 1 },
-          ['https?://instagram.com.*'] = { ['takeover'] = 'never', ['priority'] = 1 },
-          ['https?://twitter.com.*'] = { ['takeover'] = 'never', ['priority'] = 1 },
-          ['https://.*gmail.com.*'] = { ['takeover'] = 'never', ['priority'] = 1 },
-          ['https://.*google.com.*'] = { ['takeover'] = 'never', ['priority'] = 1 },
-          ['https?://.*twitch.tv.*'] = { ['takeover'] = 'never', ['priority'] = 1 },
-          ['https?://.*jira.*'] = { ['takeover'] = 'never', ['priority'] = 1 },
-      }
+  firenvim_config = {
+    ['globalSettings'] = { ['alt'] = 'all' },
+    ['localSettings'] = {
+      ['.*'] = {
+        ['cmdline'] = 'neovim',
+        ['priority'] = 0,
+        ['selector'] = 'textarea',
+        ['takeover'] = 'always',
+      },
+      ['https?://translate.google.com/.*'] = { ['takeover'] = 'never', ['priority'] = 1 },
+      ['https://studio.youtube.com.*'] = { ['takeover'] = 'never', ['priority'] = 1 },
+      ['https?://instagram.com.*'] = { ['takeover'] = 'never', ['priority'] = 1 },
+      ['https?://twitter.com.*'] = { ['takeover'] = 'never', ['priority'] = 1 },
+      ['https://.*gmail.com.*'] = { ['takeover'] = 'never', ['priority'] = 1 },
+      ['https://.*google.com.*'] = { ['takeover'] = 'never', ['priority'] = 1 },
+      ['https?://.*twitch.tv.*'] = { ['takeover'] = 'never', ['priority'] = 1 },
+      ['https?://.*jira.*'] = { ['takeover'] = 'never', ['priority'] = 1 },
     }
+  }
 })
diff --git a/nvim/lua/plugins/godot/init.lua b/nvim/lua/plugins/godot/init.lua
deleted file mode 100644
index 8fb804f..0000000
--- a/nvim/lua/plugins/godot/init.lua
+++ /dev/null
@@ -1 +0,0 @@
-require('plugins.godot.variables')
diff --git a/nvim/lua/plugins/godot/variables.lua b/nvim/lua/plugins/godot/variables.lua
deleted file mode 100644
index 4c8c5b6..0000000
--- a/nvim/lua/plugins/godot/variables.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-Variable.g({
-	godot_executable = tostring(os.getenv("HOME")) .. tostring("/.steam/steam/steamapps/common/Godot\\ Engine/godot.x11.opt.tools.64")
-})
diff --git a/nvim/lua/plugins/goyo/commands.lua b/nvim/lua/plugins/goyo/commands.lua
deleted file mode 100644
index f54db35..0000000
--- a/nvim/lua/plugins/goyo/commands.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-Command.cmd({
-    'autocmd! User GoyoEnter nested call GoyoEnter()',
-    'autocmd! User GoyoLeave nested call GoyoLeave()',
-})
diff --git a/nvim/lua/plugins/goyo/functions.lua b/nvim/lua/plugins/goyo/functions.lua
deleted file mode 100644
index 8a90c12..0000000
--- a/nvim/lua/plugins/goyo/functions.lua
+++ /dev/null
@@ -1,29 +0,0 @@
-vim.api.nvim_exec(
-[[
-fun! GoyoEnter()
-  if executable('tmux') && strlen($TMUX)
-    silent !tmux set status off
-    silent !tmux list-panes -F '\#F' | grep -q Z || tmux resize-pane -Z
-  endif
-  set noshowmode
-  set noshowcmd
-  set scrolloff=999
-  Limelight
-  " ...
-endfun
-]], true)
-
-vim.api.nvim_exec(
-[[
-fun! GoyoLeave()
-  if executable('tmux') && strlen($TMUX)
-    silent !tmux set status on
-    silent !tmux list-panes -F '\#F' | grep -q Z && tmux resize-pane -Z
-  endif
-  set showmode
-  set showcmd
-  set scrolloff=5
-  Limelight!
-  " ...
-endfun
-]], true)
diff --git a/nvim/lua/plugins/goyo/init.lua b/nvim/lua/plugins/goyo/init.lua
deleted file mode 100644
index f2f8738..0000000
--- a/nvim/lua/plugins/goyo/init.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-require('plugins.goyo.functions')
-require('plugins.goyo.commands')
diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua
index 50f6039..8a08840 100644
--- a/nvim/lua/plugins/init.lua
+++ b/nvim/lua/plugins/init.lua
@@ -10,15 +10,15 @@ require('plugins.fugitive')
 require('plugins.harpoon-nvim')
 require('plugins.git-worktree-nvim')
 require('plugins.git-signs-nvim')
-require('plugins.godot')
-require('plugins.goyo')
 require('plugins.indent-blankline-nvim')
+require('plugins.matchup')
 require('plugins.numb-nvim')
 require('plugins.nvim-dap')
 require('plugins.nvim-tree')
 require('plugins.nvim-treesitter')
 require('plugins.octo-nvim')
 require('plugins.prettier')
+require('plugins.truezen-nvim')
 require('plugins.quick-scope-nvim')
 require('plugins.telescope')
 require('plugins.undotree')
diff --git a/nvim/lua/plugins/matchup/init.lua b/nvim/lua/plugins/matchup/init.lua
new file mode 100644
index 0000000..9d6ef2b
--- /dev/null
+++ b/nvim/lua/plugins/matchup/init.lua
@@ -0,0 +1 @@
+require('plugins.matchup.variables')
diff --git a/nvim/lua/plugins/matchup/variables.lua b/nvim/lua/plugins/matchup/variables.lua
new file mode 100644
index 0000000..bee24de
--- /dev/null
+++ b/nvim/lua/plugins/matchup/variables.lua
@@ -0,0 +1,13 @@
+Variable.g({
+  matchup_matchparen_enabled = 0,
+  matchup_matchparen_deferred = 1,
+  matchup_matchparen_timeout = 300,
+  matchup_matchparen_deferred_show_delay = 50,
+  matchup_matchparen_deferred_hide_delay = 700,
+  matchup_matchparen_hi_surround_always = 0,
+  matchup_matchparen_nomode = 'i',
+})
+
+Variable.b({
+  matchup_matchparen_timeout = 300,
+})
diff --git a/nvim/lua/plugins/nvim-treesitter/settings.lua b/nvim/lua/plugins/nvim-treesitter/settings.lua
index 53ec6a9..5c6a847 100644
--- a/nvim/lua/plugins/nvim-treesitter/settings.lua
+++ b/nvim/lua/plugins/nvim-treesitter/settings.lua
@@ -51,4 +51,7 @@ require('nvim-treesitter.configs').setup({
   matchup = {
     enable = true,
   },
+  comment_commentstring = {
+    enable = true,
+  },
 })
diff --git a/nvim/lua/plugins/truezen-nvim/init.lua b/nvim/lua/plugins/truezen-nvim/init.lua
new file mode 100644
index 0000000..8a0805f
--- /dev/null
+++ b/nvim/lua/plugins/truezen-nvim/init.lua
@@ -0,0 +1 @@
+require("plugins.truezen-nvim.settings")
diff --git a/nvim/lua/plugins/truezen-nvim/settings.lua b/nvim/lua/plugins/truezen-nvim/settings.lua
new file mode 100644
index 0000000..eadb351
--- /dev/null
+++ b/nvim/lua/plugins/truezen-nvim/settings.lua
@@ -0,0 +1,68 @@
+require("true-zen").setup({
+  ui = {
+    bottom = {
+      laststatus = 0,
+      ruler = false,
+      showmode = false,
+      showcmd = false,
+      cmdheight = 1,
+    },
+    top = {
+      showtabline = 0,
+    },
+    left = {
+      number = false,
+      relativenumber = false,
+      signcolumn = "no",
+    },
+  },
+  modes = {
+    ataraxis = {
+      left_padding = 32,
+      right_padding = 32,
+      top_padding = 1,
+      bottom_padding = 1,
+      ideal_writing_area_width = {0},
+      auto_padding = true,
+      keep_default_fold_fillchars = true,
+      custom_bg = {"none", ""},
+      bg_configuration = true,
+      quit = "untoggle",
+      ignore_floating_windows = true,
+      affected_higroups = {
+        NonText = true,
+        FoldColumn = true,
+        ColorColumn = true,
+        VertSplit = true,
+        StatusLine = true,
+        StatusLineNC = true,
+        SignColumn = true,
+      },
+    },
+    focus = {
+      margin_of_error = 5,
+      focus_method = "experimental"
+    },
+  },
+  integrations = {
+    vim_gitgutter = false,
+    galaxyline = false,
+    tmux = false,
+    gitsigns = false,
+    nvim_bufferline = false,
+    limelight = true,
+    twilight = false,
+    vim_airline = true,
+    vim_powerline = false,
+    vim_signify = false,
+    express_line = false,
+    lualine = false,
+    lightline = false,
+    feline = false
+  },
+  misc = {
+    on_off_commands = false,
+    ui_elements_commands = false,
+    cursor_by_mode = false,
+  }
+})