diff --git a/.gitignore b/.gitignore
index d699e1d6..770c212d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ tags
 test.sh
 .luarc.json
 nvim
+spell
diff --git a/init.lua b/init.lua
index c8af5b77..eec899a9 100644
--- a/init.lua
+++ b/init.lua
@@ -551,6 +551,9 @@ cmp.setup {
 require('oil').setup()
 vim.keymap.set('n', '<leader>-', '<CMD>Oil --float<CR>', { desc = 'Open current directory' })
 
+-- Configure Todo-Comments
+require('todo-comments').setup()
+
 -- Configure Theme
 require('catppuccin').setup({
 	flavour = 'macchiato',
@@ -565,5 +568,7 @@ require('catppuccin').setup({
 })
 
 vim.cmd.colorscheme 'catppuccin'
+vim.opt.spell = true
+vim.opt.spelloptions = 'camel'
 
 -- vim: ts=2 sts=2 sw=2 et
diff --git a/lazy-lock.json b/lazy-lock.json
index b61d1eb8..0831d179 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -24,6 +24,7 @@
   "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
+  "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
   "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" },
   "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
   "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index d809eb45..d1f16ecf 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -13,5 +13,11 @@ return {
 
 	-- Theme
 	{ 'catppuccin/nvim', name='catppuccin', priority = 1000 },
+
+	-- Better Comments
+	{
+		'folke/todo-comments.nvim',
+		dependencies = { 'nvim-lua//plenary.nvim' }
+	},
 }