diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index f17dd4e..0735b2f 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -17,6 +17,9 @@ initial_window_height 650
 enable_audio_bell no
 macos_traditional_fullscreen yes
 
+allow_remote_control socket-only
+listen_on unix:/tmp/kitty
+
 map cmd+enter toggle_fullscreen
 
 # BEGIN_KITTY_THEME
diff --git a/nvim/after/plugin/goyo.lua b/nvim/after/plugin/goyo.lua
deleted file mode 100644
index 5fd5e86..0000000
--- a/nvim/after/plugin/goyo.lua
+++ /dev/null
@@ -1,30 +0,0 @@
--- Goyo – https://github.com/junegunn/goyo.vim
-local keymap = vim.api.nvim_set_keymap
-local opts = { noremap = true, silent = true }
-
-vim.cmd([[
- function! s:goyo_enter()
-  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
-  Gitsigns toggle_signs
-endfunction
-
-function! s:goyo_leave()
-  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=8
-  Gitsigns toggle_signs
-endfunction
-
-autocmd! User GoyoEnter nested call <SID>goyo_enter()
-autocmd! User GoyoLeave nested call <SID>goyo_leave()
-]])
diff --git a/nvim/after/plugin/whichkey.lua b/nvim/after/plugin/whichkey.lua
index 311e831..cdf738f 100644
--- a/nvim/after/plugin/whichkey.lua
+++ b/nvim/after/plugin/whichkey.lua
@@ -92,12 +92,8 @@ local mappings = {
 	},
 	v = { "<CMD>lua require('export-to-vscode').launch()<CR>", "Export to Visual Studio Code" },
 	w = { "<CMD>w!<CR>", "Save" },
-	z = {
-		name = "Zen",
-		g = { "<CMD>Goyo<CR>", "Goyo" },
-		z = { "<CMD>ZenMode<CR>", "ZenMode" },
-		t = { "<CMD>Twilight<CR>", "Twilight Mode" },
-	},
+	x = { "<CMD>Twilight<CR>", "Twilight Mode" },
+	z = { "<CMD>ZenMode<CR>", "Zen Mode" },
 	A = { "<CMD>Alpha<CR>", "Alpha" },
 	B = {
 		name = "Bufferline",
diff --git a/nvim/after/plugin/zen-mode.lua b/nvim/after/plugin/zen-mode.lua
new file mode 100644
index 0000000..497724e
--- /dev/null
+++ b/nvim/after/plugin/zen-mode.lua
@@ -0,0 +1,42 @@
+-- Zen Mode – https://github.com/folke/zen-mode.nvim
+local status_ok, zenmode = pcall(require, "zen-mode")
+if not status_ok then
+	return
+end
+
+zenmode.setup({
+	window = {
+		backdrop = 0.98,
+		width = 80,
+		height = 0.85,
+		options = {
+			signcolumn = "no", -- disable signcolumn
+			number = false, -- disable number column
+			relativenumber = false, -- disable relative numbers
+			cursorline = false, -- disable cursorline
+			cursorcolumn = false, -- disable cursor column
+			foldcolumn = "0", -- disable fold column
+			list = false, -- disable whitespace characters
+		},
+	},
+	plugins = {
+		options = {
+			enabled = true,
+			ruler = true, -- disables the ruler text in the cmd line area
+			showcmd = false, -- disables the command in the last line of the screen
+		},
+		twilight = { enabled = true }, -- enable to start Twilight when zen mode opens
+		gitsigns = { enabled = false }, -- disables git signs
+		tmux = { enabled = true }, -- disables the tmux statusline
+		kitty = {
+			enabled = true,
+			font = "+5", -- font size increment
+		},
+	},
+	on_open = function()
+		vim.cmd([[:IndentBlanklineDisable]])
+	end,
+	on_close = function()
+		vim.cmd([[:IndentBlanklineEnable]])
+	end,
+})
diff --git a/nvim/lua/kogakure/plugins.lua b/nvim/lua/kogakure/plugins.lua
index 0961f78..5d231b5 100644
--- a/nvim/lua/kogakure/plugins.lua
+++ b/nvim/lua/kogakure/plugins.lua
@@ -125,7 +125,6 @@ return packer.startup(function(use)
 	use("bogado/file-line") -- Jump directly to line in file with 'nvim index.html:20'
 	use("ruanyl/vim-gh-line") -- Open current line in GitHub
 	use("nvim-pack/nvim-spectre") -- Search and replace
-	use("junegunn/goyo.vim") -- Zen Mode (1)
 	use("folke/zen-mode.nvim") -- Zen Mode (2)
 	use("tpope/vim-eunuch") -- UNIX Shell commands
 	use("folke/twilight.nvim") -- Dim inactive code