diff --git a/lua/user/lsp/mason.lua b/lua/user/lsp/mason.lua
index 138db95..5a0b37d 100644
--- a/lua/user/lsp/mason.lua
+++ b/lua/user/lsp/mason.lua
@@ -54,38 +54,3 @@ for _, server in pairs(servers) do
 
 	lspconfig[server].setup(opts)
 end
-
-local mason_nvim_dap_ok, mason_nvim_dap = pcall(require, "mason-nvim-dap")
-if mason_nvim_dap_ok then
-    local dap = require('dap')
-	mason_nvim_dap.setup({
-		automatic_setup = true,
-	})
-	mason_nvim_dap.setup_handlers({
-		function(source_name)
-			-- all sources with no handler get passed here
-
-			-- Keep original functionality of `automatic_setup = true`
-			require("mason-nvim-dap.automatic_setup")(source_name)
-		end,
-		python = function(source_name)
-			dap.adapters.python = {
-				type = "executable",
-				command = "/usr/bin/python3",
-				args = {
-					"-m",
-					"debugpy.adapter",
-				},
-			}
-
-			dap.configurations.python = {
-				{
-					type = "python",
-					request = "launch",
-					name = "Launch file",
-					program = "${file}", -- This configuration will launch the current file if used.
-				},
-			}
-		end,
-	})
-end
diff --git a/lua/user/lualine.lua b/lua/user/lualine.lua
index 5664fb2..46cb784 100644
--- a/lua/user/lualine.lua
+++ b/lua/user/lualine.lua
@@ -12,30 +12,30 @@ local diagnostics = {
   sources = { "nvim_diagnostic" },
   sections = { "error", "warn" },
   symbols = { error = " ", warn = " " },
-  colored = false,
+  colored = true,
   always_visible = true,
 }
 
 local diff = {
   "diff",
-  colored = false,
-  symbols = { added = "+", modified = "~", removed = "-" }, -- changes diff symbols
+  colored = true,
+  symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols
   cond = hide_in_width,
 }
 
 local filetype = {
   "filetype",
-  icons_enabled = false,
+  icons_enabled = true,
 }
 
 local location = {
   "location",
-  padding = 0,
+  padding = { right = 1 },
 }
 
-local spaces = function()
-  return "spaces: " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
-end
+-- local spaces = function()
+--   return "spaces: " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
+-- end
 
 lualine.setup {
   options = {
@@ -51,7 +51,7 @@ lualine.setup {
     lualine_a = { "mode" },
     lualine_b = {"branch"},
     lualine_c = { diagnostics },
-    lualine_x = { diff, spaces, "encoding", filetype },
+    lualine_x = { diff, filetype },
     lualine_y = { location },
     lualine_z = { "progress" },
   },
diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua
index b8a53bc..ffad3c4 100644
--- a/lua/user/plugins.lua
+++ b/lua/user/plugins.lua
@@ -91,11 +91,9 @@ return packer.startup(function(use)
 	-- Treesitter
 	use({
 		"nvim-treesitter/nvim-treesitter",
-		commit = "1942f3554184e9d9dfb90dcc6542047b8f6511f2",
 	})
 	use({
 		"nvim-treesitter/nvim-treesitter-context",
-		commit = "0dd5eae6dbf226107da2c2041ffbb695d9e267c1",
 	})
 
 	-- Git
@@ -122,6 +120,8 @@ return packer.startup(function(use)
 
 	use({ "mbbill/undotree" })
 
+    use({ "folke/trouble.nvim" })
+
 	-- Automatically set up your configuration after cloning packer.nvim
 	-- Put this at the end after all plugins
 	if PACKER_BOOTSTRAP then