diff --git a/data/kitty/kitty.conf b/data/kitty/kitty.conf
index 7b351ba..a212fb8 100644
--- a/data/kitty/kitty.conf
+++ b/data/kitty/kitty.conf
@@ -6,7 +6,7 @@ include mocha.conf
 font_family Maple Mono
 bold_font Maple Mono Bold
 italic_font Victor Mono Italic
-bold_italic_font IBM Plex Mono Bold Italic
+bold_italic_font Maple Mono Bold Italic
 font_size 14.0
 
 # https://github.com/ryanoasis/nerd-fonts/wiki/Glyph-Sets-and-Code-Points
@@ -26,9 +26,10 @@ symbol_map U+EA60-U+EBEB Symbols Nerd Font Mono
 symbol_map U+E276C-U+2771 Symbols Nerd Font Mono
 symbol_map U+2500-U+259F Symbols Nerd Font Mono
 
-font_features 0xProto -liga -calt
-font_features MapleMono-Regular -liga -calt +zero
-font_features MapleMono-Regular_Bold -liga -calt +zero
+font_features MapleMono-Regular -calt +zero
+font_features MapleMono-Regular_Bold -calt +zero
+font_features MapleMono-Italic -calt +zero
+font_features MapleMono-Italic_Bold-Italic -calt +zero
 
 modify_font cell_height 120%
 
diff --git a/data/nvim/init.lua b/data/nvim/init.lua
index 0bd9760..dc52f71 100644
--- a/data/nvim/init.lua
+++ b/data/nvim/init.lua
@@ -170,6 +170,10 @@ require("lazy").setup({
 					group_empty = true,
 					root_folder_label = false,
 					indent_width = 1,
+					special_files = {
+						"go.mod",
+						"go.sum",
+					},
 					icons = {
 						show = {
 							folder_arrow = false,
@@ -333,12 +337,26 @@ require("lazy").setup({
 			}
 
 			require("nvim-web-devicons").setup({
+				default = true,
+				strict = true,
 				override_by_filename = {
 					[".gitignore"] = icon_git,
 					[".gitmodules"] = icon_git,
+					["Makefile"] = {
+						icon = " ",
+						color = "#fffafa",
+						name = "Makefile",
+					},
 					["go.mod"] = icon_go,
 					["go.sum"] = icon_go,
 				},
+				override_by_extension = {
+					["sh"] = {
+						icon = " ",
+						color = "#44d62c",
+						name = "sh",
+					},
+				},
 			})
 		end,
 	},
@@ -529,8 +547,10 @@ require("lazy").setup({
 		init = function()
 			vim.g.copilot_filetypes = {
 				["*"] = false,
+				gitcommit = true,
 				go = true,
 				lua = true,
+				make = true,
 				markdown = true,
 				proto = true,
 				python = true,