diff --git a/lua/config/ui.lua b/lua/config/ui.lua
index 0165f84..14239df 100644
--- a/lua/config/ui.lua
+++ b/lua/config/ui.lua
@@ -89,5 +89,28 @@ vim.g.ui = {
 				untracked = { text = "┆" },
 			},
 		},
+		todo_comments = {
+			error = {
+				icon = "",
+			},
+			todo = {
+				icon = "",
+			},
+			hack = {
+				icon = "",
+			},
+			warn = {
+				icon = "",
+			},
+			perf = {
+				icon = "󰾆",
+			},
+			note = {
+				icon = "",
+			},
+			test = {
+				icon = "󰙨",
+			},
+		},
 	}
 }
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index dfe548f..2a59874 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -130,7 +130,7 @@ return {
 			vim.keymap.set("n", "<leader>fh", builtin.help_tags, { desc = "Find Help" })
 			vim.keymap.set("n", "<leader>fq", builtin.quickfix, { desc = "Quickfix" })
 			vim.keymap.set("n", "<leader>fQ", builtin.quickfixhistory, { desc = "Quickfix History" })
-			vim.keymap.set("n", "<leader>ft", builtin.filetypes, { desc = "Show Filetypes" })
+			vim.keymap.set("n", "<leader>fT", builtin.filetypes, { desc = "Show Filetypes" })
 			vim.keymap.set("n", "<leader>fH", builtin.quickfixhistory, { desc = "Find Highlights" })
 			vim.keymap.set("n", "<leader>fc", builtin.quickfixhistory, { desc = "Find Resume" })
 			vim.keymap.set("n", "<leader>fd", builtin.diagnostics, { desc = "Find Diagnostics" })
diff --git a/lua/plugins/todo-comments.lua b/lua/plugins/todo-comments.lua
new file mode 100644
index 0000000..d5e56d2
--- /dev/null
+++ b/lua/plugins/todo-comments.lua
@@ -0,0 +1,74 @@
+--[[
+
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣠⣴⣾⣷⣦⣄⡀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣠⣴⣾⣿⣿⣿⣿⣿⣿⣿⣿⣷⣦⣄⡀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣠⣴⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣦⣄⡀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡀⠚⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠗⢀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⣤⣄⡉⠓⠦⣌⡙⠻⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠟⢋⣡⠴⠚⢉⣠⣤⣀
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣤⣶⣿⣿⣿⣿⣿⣷⣦⣄⡉⠓⠦⣌⡙⠻⢿⣿⣿⣿⣿⣿⣿⡿⠟⢋⣡⠴⠚⢉⣠⣴⣾⣿⣿⣿⣿⣿⣶⣤
+⠀⠀⠀⠀⠀⠀⠀⠀⠐⣦⣄⡉⠛⠿⣿⣿⣿⣿⣿⣿⣿⣷⣦⣄⡉⠓⠦⣌⡙⠻⠟⢋⣡⠴⠚⢉⣠⣴⣾⣿⣿⣿⣿⣿⣿⣿⠿⠛⢉⣠⣴⠂
+⠀⠀⠀⠀⢀⣠⣴⣆⡈⠻⢿⣿⣷⣦⣄⡉⠛⠿⣿⣿⣿⣿⣿⣿⣿⣷⣦⣄⡉⠃⠘⢉⣠⣴⣾⣿⣿⣿⣿⣿⣿⣿⠿⠛⢉⣠⣴⣾⣿⡿⠟⢁⣰⣦⣄⡀
+⠀⠀⠐⠾⣿⣿⣿⣿⣿⣷⣦⣌⡙⠻⢿⣿⣷⣦⣄⡉⠛⠿⣿⣿⣿⣿⣿⣿⣿⣷⣾⣿⣿⣿⣿⣿⣿⣿⠿⠛⢉⣠⣴⣾⣿⡿⠟⢋⣡⣴⣾⣿⣿⣿⣿⣿⠷⠂
+⠀⢸⣷⣦⣄⡉⠛⠿⣿⣿⣿⣿⣿⣷⣦⣌⡙⠻⢿⣿⣷⣦⣄⡉⠛⠿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠛⢉⣠⣴⣾⣿⡿⠟⢋⣡⣴⣾⣿⣿⣿⣿⣿⠿⠛⢉⣠⣴⣾⡇
+⠀⢸⣿⣿⣿⣿⣷⣦⣄⡉⠛⠿⣿⣿⣿⣿⣿⣷⣦⣌⡙⠻⢿⣿⣷⣦⣄⡉⠛⠿⠿⠛⢉⣠⣴⣾⣿⡿⠟⢋⣡⣴⣾⣿⣿⣿⣿⣿⠿⠛⢉⣠⣴⣾⣿⣿⣿⣿⡇
+⠀⠀⠉⠛⠿⣿⣿⣿⣿⣿⣷⣦⣄⡉⠛⠿⣿⣿⣿⣿⣿⣷⣦⣌⡙⠻⢿⣿⣷⡆⢰⣾⣿⡿⠟⢋⣡⣴⣾⣿⣿⣿⣿⣿⠿⠛⢉⣠⣴⣾⣿⣿⣿⣿⣿⠿⠛⠉
+⠀⠀⠀⠀⠀⠀⠉⠛⠿⣿⣿⣿⣿⣿⣷⣦⣄⡉⠛⠿⣿⣿⣿⣿⣿⣷⣦⣌⡙⠃⠘⢋⣡⣴⣾⣿⣿⣿⣿⣿⠿⠛⢉⣠⣴⣾⣿⣿⣿⣿⣿⠿⠛⠉
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠛⠿⣿⣿⣿⣿⣿⣷⣦⣄⡉⠛⠿⣿⣿⣿⣿⣿⣷⣾⣿⣿⣿⣿⣿⠿⠛⢉⣠⣴⣾⣿⣿⣿⣿⣿⠿⠛⠉
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠛⠿⣿⣿⣿⣿⣿⣷⣦⣄⡉⠛⠿⣿⣿⣿⣿⠿⠛⢉⣠⣴⣾⣿⣿⣿⣿⣿⠿⠛⠉
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠛⠿⣿⣿⣿⣿⣿⣷⣦⣄⡉⢉⣠⣴⣾⣿⣿⣿⣿⣿⠿⠛⠉
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠛⠿⣿⣿⣿⣿⡇⢸⣿⣿⣿⣿⠿⠛⠉
+⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠛⠿⡇⢸⠿⠛⠉
+
+              __             _             _
+             / _|___     ___| |_ __ _  ___| | __
+            | ||_  /____/ __| __/ _` |/ __| |/ /
+            |  _/ /_____\__ \ || (_| | (__|   <
+            |_|/___|    |___/\__\__,_|\___|_|\_\
+
+                Neovim 0.12 configuration
+                  (c) Frank Zechert 2026
+]]
+
+return {
+	{
+		"folke/todo-comments.nvim",
+		dependencies = {
+			{ "nvim-lua/plenary.nvim" },
+		},
+		opts = {
+			signs = true,
+			sign_priority = 8,
+			keywords = {
+				FIX = {
+					icon = vim.g.ui.symbols.todo_comments.error.icon,
+				},
+				TODO = {
+					icon = vim.g.ui.symbols.todo_comments.todo.icon,
+				},
+				HACK = {
+					icon = vim.g.ui.symbols.todo_comments.hack.icon,
+				},
+				WARN = {
+					icon = vim.g.ui.symbols.todo_comments.warn.icon,
+				},
+				PERF = {
+					icon = vim.g.ui.symbols.todo_comments.perf.icon,
+				},
+				NOTE = {
+					icon = vim.g.ui.symbols.todo_comments.note.icon,
+				},
+				TEST = {
+					icon = vim.g.ui.symbols.todo_comments.test.icon,
+				},
+			},
+		},
+		config = function(_, opts)
+			local todocomments = require("todo-comments")
+			todocomments.setup(opts)
+
+			vim.keymap.set("n", "]t", todocomments.jump_next, { desc = "Next TODO comment" })
+			vim.keymap.set("n", "[t", todocomments.jump_prev, { desc = "Previous TODO comment" })
+			vim.keymap.set("n", "ft", "<Cmd>:TodoTelescope<CR>" , { desc = "Find TODO comment" })
+		end,
+	}
+}