diff --git a/.gitmodules b/.gitmodules
index 82f2c63..681634e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,3 +49,6 @@
 [submodule "nvim/pack/syntaxes/start/vim-polyglot"]
 	path = nvim/pack/syntaxes/start/vim-polyglot
 	url = https://github.com/sheerun/vim-polyglot.git
+[submodule "nvim/pack/syntaxes/start/vim-commentary"]
+	path = nvim/pack/syntaxes/start/vim-commentary
+	url = https://github.com/tpope/vim-commentary.git
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index b24daf5..a605dce 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -1,8 +1,7 @@
 font_family				Cascadia Code PL Regular
-# font_family				Fira Code
-bold_font				auto
-italic_font				auto
-bold_italic_font		auto
+bold_font				Cascadia Code PL Regular
+italic_font				Cascadia Code PL Regular
+bold_italic_font			Cascadia Code PL Regular
 font_size				14.0
 
 disable_ligatures 		never
@@ -13,7 +12,7 @@ foreground 				#cecece
 
 hide_window_decorations	yes
 
-enabled_layouts			tall
+enabled_layouts			tall, fat, grid, stack
 
 window_border_width		1
 window_padding_width	1
@@ -33,3 +32,5 @@ enable_audio_bell		no
 cursor_shape			block
 cursor_beam_thickness	2.5
 cursor_blink_interval	0
+
+map Ctrl+Shift+d			detach_window new-tab
diff --git a/nvim/init.vim b/nvim/init.vim
index 6e061f8..c114dfc 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -33,6 +33,11 @@ augroup python
 augroup END
 " }}}
 
+" CSV files {{{
+augroup csv
+	au FileType csv setlocal list				" Display special characters, like tabs (for TSV files)
+augroup END
+
 " Rust {{{
 let g:rustfmt_autosave = 1
 " }}}
diff --git a/nvim/pack/syntaxes/start/vim-commentary b/nvim/pack/syntaxes/start/vim-commentary
new file mode 160000
index 0000000..f8238d7
--- /dev/null
+++ b/nvim/pack/syntaxes/start/vim-commentary
@@ -0,0 +1 @@
+Subproject commit f8238d70f873969fb41bf6a6b07ca63a4c0b82b1