diff --git a/platforms/linux/hypr/hyprland.conf b/platforms/linux/hypr/hyprland.conf
index 8ecf5a9..d01aa2b 100644
--- a/platforms/linux/hypr/hyprland.conf
+++ b/platforms/linux/hypr/hyprland.conf
@@ -54,7 +54,7 @@ monitor=DP-2,3840x2160@59,0x0,1.666667
 # See https://wiki.hyprland.org/Configuring/Keywords/
 
 # Set programs that you use
-$terminal = wezterm-gui
+$terminal = kitty
 $fileManager = dolphin
 $menu = wofi
 
diff --git a/platforms/linux/kde/kglobalshortcutsrc b/platforms/linux/kde/kglobalshortcutsrc
index 8cbec13..1ae46b8 100644
--- a/platforms/linux/kde/kglobalshortcutsrc
+++ b/platforms/linux/kde/kglobalshortcutsrc
@@ -42,15 +42,15 @@ _k_friendly_name=Krusader
 bring_main_window_to_top=Meta+K,Meta+K,Bring Main Window to Top
 
 [ksmserver]
-Halt Without Confirmation=none,,Shut Down Without Confirmation
+Halt Without Confirmation=none,none,Shut Down Without Confirmation
 Lock Session=Meta+L\tScreensaver,Meta+L\tScreensaver,Lock Session
 Log Out=Ctrl+Alt+Del,Ctrl+Alt+Del,Show Logout Screen
-Log Out Without Confirmation=none,,Log Out Without Confirmation
-LogOut=none,,Log Out
-Reboot=none,,Reboot
-Reboot Without Confirmation=none,,Reboot Without Confirmation
-Shut Down=none,,Shut Down
-_k_friendly_name=Session Management
+Log Out Without Confirmation=none,none,Log Out Without Confirmation
+LogOut=none,none,Log Out
+Reboot=none,none,Reboot
+Reboot Without Confirmation=none,none,Reboot Without Confirmation
+Shut Down=none,none,Shut Down
+_k_friendly_name=KWin
 
 [kwin]
 Activate Window Demanding Attention=Meta+Ctrl+A,Meta+Ctrl+A,Activate Window Demanding Attention
@@ -248,11 +248,11 @@ view_zoom_out=Meta+-,Meta+-,Zoom Out
 
 [mediacontrol]
 _k_friendly_name=Media Controller
-mediavolumedown=none,,Media volume down
-mediavolumeup=none,,Media volume up
+mediavolumedown=none,none,Media volume down
+mediavolumeup=none,none,Media volume up
 nextmedia=Media Next,Media Next,Media playback next
 pausemedia=Media Pause,Media Pause,Pause media playback
-playmedia=none,,Play media playback
+playmedia=none,none,Play media playback
 playpausemedia=Media Play,Media Play,Play/Pause media playback
 previousmedia=Media Previous,Media Previous,Media playback previous
 stopmedia=Media Stop,Media Stop,Stop media playback
@@ -277,7 +277,7 @@ powerProfile=Battery\tMeta+B,Battery\tMeta+B,Switch Power Profile
 _k_friendly_name=plasmashell
 activate application launcher=Meta\tAlt+F1,Meta\tAlt+F1,Activate Application Launcher
 activate task manager entry 1=none,Meta+1,Activate Task Manager Entry 1
-activate task manager entry 10=none,,Activate Task Manager Entry 10
+activate task manager entry 10=none,none,Activate Task Manager Entry 10
 activate task manager entry 2=none,Meta+2,Activate Task Manager Entry 2
 activate task manager entry 3=none,Meta+3,Activate Task Manager Entry 3
 activate task manager entry 4=none,Meta+4,Activate Task Manager Entry 4
@@ -287,22 +287,22 @@ activate task manager entry 7=none,Meta+7,Activate Task Manager Entry 7
 activate task manager entry 8=none,Meta+8,Activate Task Manager Entry 8
 activate task manager entry 9=none,Meta+9,Activate Task Manager Entry 9
 activate widget 3=none,none,Activate Application Launcher Widget
-clear-history=none,,Clear Clipboard History
+clear-history=none,none,Clear Clipboard History
 clipboard_action=Meta+Ctrl+X,Meta+Ctrl+X,Automatic Action Popup Menu
 cycle-panels=Meta+Alt+P,Meta+Alt+P,Move keyboard focus between panels
-cycleNextAction=none,,Next History Item
-cyclePrevAction=none,,Previous History Item
+cycleNextAction=none,none,Next History Item
+cyclePrevAction=none,none,Previous History Item
 manage activities=none,Meta+Q,Show Activity Switcher
 next activity=Meta+A,none,Walk through activities
 previous activity=Meta+Shift+A,none,Walk through activities (Reverse)
-repeat_action=none,,Manually Invoke Action on Current Clipboard
+repeat_action=none,none,Manually Invoke Action on Current Clipboard
 show dashboard=Ctrl+F12,Ctrl+F12,Show Desktop
-show-barcode=none,,Show Barcode…
+show-barcode=none,none,Show Barcode…
 show-on-mouse-pos=Meta+V,Meta+V,Show Clipboard Items at Mouse Position
 stop current activity=Meta+S,Meta+S,Stop Current Activity
-switch to next activity=none,,Switch to Next Activity
-switch to previous activity=none,,Switch to Previous Activity
-toggle do not disturb=none,,Toggle do not disturb
+switch to next activity=none,none,Switch to Next Activity
+switch to previous activity=none,none,Switch to Previous Activity
+toggle do not disturb=none,none,Toggle do not disturb
 
 [services][kitty.desktop]
 _launch=Meta+R
diff --git a/tools/nvim/lua/plugins/lsp.lua b/tools/nvim/lua/plugins/lsp.lua
index 976ea96..07a23ae 100644
--- a/tools/nvim/lua/plugins/lsp.lua
+++ b/tools/nvim/lua/plugins/lsp.lua
@@ -41,39 +41,7 @@ return {
     "NoahTheDuke/vim-just",
     ft = { "just" },
   },
-  {
-    "akinsho/org-bullets.nvim",
-    ft = { "org" },
-    config = function()
-      require("org-bullets").setup()
-    end,
-  },
-  {
-    "nvim-orgmode/orgmode",
-    ft = { "org" },
-    config = function()
-      -- Setup orgmode
-      require("orgmode").setup({
-        org_agenda_files = "~/OrgFiles/tasks/*",
-        org_default_notes_file = "~/OrgFiles/tasks/inbox.org",
-        org_archive_location = "~/OrgFiles/archive/%s_archive::",
-        org_todo_keywords = { "TODO(t)", "NEXT(n)", "WAIT(w)", "|", "DONE(d)", "CANCELLED(c)" },
-        org_hide_leading_stars = true,
-        org_hide_emphasis_markers = true,
-        org_log_into_drawer = "LOGBOOK",
-        org_highlight_latex_and_related = "native",
-        org_startup_indented = true,
-        org_deadline_warning_days = 10,
-      })
-
-      -- NOTE: If you are using nvim-treesitter with ~ensure_installed = "all"~ option
-      -- add ~org~ to ignore_install
-      -- require('nvim-treesitter.configs').setup({
-      --   ensure_installed = 'all',
-      --   ignore_install = { 'org' },
-      -- })
-    end,
-  },
+  { import = "plugins.mod.lang-org" },
   { import = "plugins.mod.trouble-nvim" },
   {
     "nvim-treesitter/nvim-treesitter",
@@ -87,10 +55,13 @@ return {
       "VeryLazy",
     },
     opts = {
-      ensure_installed = { "markdown", "markdown_inline", "latex", "python" },
+      ensure_installed = { "c", "lua", "vim", "vimdoc", "markdown", "markdown_inline" },
       highlight = { enable = true },
       indent = { enable = true },
     },
+    config = function(_, opts)
+      require("nvim-treesitter.configs").setup(opts)
+    end,
   },
   {
     "folke/lazydev.nvim",
diff --git a/tools/nvim/lua/plugins/mod/blink-cmp.lua b/tools/nvim/lua/plugins/mod/blink-cmp.lua
index a67cf4a..75fe1d7 100644
--- a/tools/nvim/lua/plugins/mod/blink-cmp.lua
+++ b/tools/nvim/lua/plugins/mod/blink-cmp.lua
@@ -44,12 +44,20 @@ return {
 
     sources = {
       default = { "lazydev", "lsp", "path", "snippets", "buffer" },
+      per_filetype = {
+        org = { "orgmode" },
+      },
       providers = {
         lazydev = {
           name = "LazyDev",
           module = "lazydev.integrations.blink",
           score_offset = 100,
         },
+        orgmode = {
+          name = "Orgmode",
+          module = "orgmode.org.autocompletion.blink",
+          fallbacks = { "buffer" },
+        },
       },
     },
 
diff --git a/tools/nvim/lua/plugins/mod/lang-org.lua b/tools/nvim/lua/plugins/mod/lang-org.lua
new file mode 100644
index 0000000..9cce736
--- /dev/null
+++ b/tools/nvim/lua/plugins/mod/lang-org.lua
@@ -0,0 +1,45 @@
+return {
+  "nvim-orgmode/orgmode",
+  dependencies = {
+    "nvim-telescope/telescope.nvim",
+    "nvim-orgmode/telescope-orgmode.nvim",
+    "nvim-orgmode/org-bullets.nvim",
+    "Saghen/blink.cmp",
+  },
+  event = "VeryLazy",
+  config = function()
+    require("orgmode").setup({
+      org_agenda_files = "~/OrgFiles/tasks/*",
+      org_default_notes_file = "~/OrgFiles/tasks/inbox.org",
+      org_archive_location = "~/OrgFiles/archive/%s_archive::",
+      org_todo_keywords = { "TODO(t)", "NEXT(n)", "WAIT(w)", "|", "DONE(d)", "CANCELLED(c)" },
+      org_hide_leading_stars = true,
+      org_hide_emphasis_markers = true,
+      org_log_into_drawer = "LOGBOOK",
+      org_highlight_latex_and_related = "native",
+      org_startup_indented = true,
+      org_deadline_warning_days = 10,
+    })
+    require("org-bullets").setup()
+    require("blink.cmp").setup({
+      sources = {
+        per_filetype = {
+          org = { "orgmode" },
+        },
+        providers = {
+          orgmode = {
+            name = "Orgmode",
+            module = "orgmode.org.autocompletion.blink",
+            fallbacks = { "buffer" },
+          },
+        },
+      },
+    })
+
+    require("telescope").setup()
+    require("telescope").load_extension("orgmode")
+    vim.keymap.set("n", "<leader>r", require("telescope").extensions.orgmode.refile_heading)
+    vim.keymap.set("n", "<leader>fh", require("telescope").extensions.orgmode.search_headings)
+    vim.keymap.set("n", "<leader>li", require("telescope").extensions.orgmode.insert_link)
+  end,
+}
diff --git a/tools/nvim/lua/plugins/mod/nvim-lspconfig.lua b/tools/nvim/lua/plugins/mod/nvim-lspconfig.lua
index 6671b35..e8dd9b8 100644
--- a/tools/nvim/lua/plugins/mod/nvim-lspconfig.lua
+++ b/tools/nvim/lua/plugins/mod/nvim-lspconfig.lua
@@ -16,6 +16,7 @@ return {
       powershell_es = {}, -- PowerShell
       pyright = {}, -- Python
       taplo = {}, -- TOML
+      rust_analyzer = {}, -- Rust
       ts_ls = {}, -- TypeScript
       vimls = {}, -- vimscript
       yamlls = {}, -- YAML