diff --git a/nvim/init.lua b/nvim/init.lua
index 6bc0772..ca88705 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -45,6 +45,7 @@
 vim.loader.enable()
 
 require('custom_commands')
+require('ui2')
 require('plugins')
 require('autocmds')
 require('keymappings')
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index a61867c..dd84bf6 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -1,10 +1,3 @@
-require('vim._core.ui2').enable {
-    enable = true,
-    msg = {
-        targets = "msg",
-    }
-}
-
 -- Load the following plugins eagerly to prevent visual oddities
 require('plugins.gruvbox') -- Colorscheme setup
 require('plugins.lualine') -- Status line plugin
@@ -12,14 +5,15 @@ require('plugins.lualine') -- Status line plugin
 -- vim.schedule defers plugin loading for after the main loop starts
 -- Startup is cleaner and faster than ever
 vim.schedule(function()
+    require('plugins.yaml-companion')   -- Additional YAML and JSON schema helper
     require('plugins.language_support') -- LSP, treesitter and any other language specific support plugins
     require('plugins.gitsigns')         -- Git gutter notifiers
     require('plugins.nvim-cmp')         -- Autocompletion plugin (TODO: Move to builtin completion?)
     require('plugins.luasnip')          -- Snippet engine
     require('plugins.telescope')        -- Floating window fuzzy searching different sources
-    require('plugins.telekasten')       -- Note taking plugins
+    require('plugins.telekasten')       -- Note taking plugin
     require('plugins.mason')            -- LSP and DAP manager
-    require('plugins.twilight')         -- Focus mode, dim lines around the cursor's location
+    -- require('plugins.twilight')         -- Focus mode, dim lines around the cursor's location
     require('plugins.render-markdown')  -- Render markdown directly in neovim
 
     vim.pack.add({
@@ -32,6 +26,8 @@ vim.schedule(function()
     require('nvim-autopairs').setup() -- Automatic pair completion of paranteticals, braces, quotes, etc.
     require('plugins.dap')            -- DAP debugging plugin
     require('plugins.dap-python')     -- Debug plugin settings specifically for python
-    require('plugins.yaml-companion') -- Additional YAML and JSON schema helper
-    require('plugins.nvim-lint')      -- Linter loader
+
+    -- Experimental
+    require('plugins.note_taking') -- In house note taking plugin (TODO: rename once the plugin name is solidified)
+    -- require('plugins.nvim-lint')      -- Linter loader
 end)
diff --git a/nvim/lua/plugins/yaml-companion.lua b/nvim/lua/plugins/yaml-companion.lua
index 796f403..c9b85f5 100644
--- a/nvim/lua/plugins/yaml-companion.lua
+++ b/nvim/lua/plugins/yaml-companion.lua
@@ -2,6 +2,12 @@ vim.pack.add({
     'https://github.com/mosheavni/yaml-companion.nvim'
 })
 
-local cfg = require('yaml-companion').setup()
+local cfg = require('yaml-companion').setup {
+    builtin_matchers = {
+        kubernetes = { enabled = true },
+        cloud_init = { enabled = true }
+    }
+}
+
 vim.lsp.config('yamlls', cfg)
 vim.lsp.enable('yamlls')
diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua
index 4266a5c..bdb76be 100644
--- a/nvim/lua/settings.lua
+++ b/nvim/lua/settings.lua
@@ -21,7 +21,6 @@ vim.opt.listchars = 'tab:|·,trail:¬,extends:>,precedes:<,nbsp:+'    -- Charact
 vim.opt.mouse = 'a'                                                 -- Enable mouse mode
 vim.opt.number = true                                               -- Show the line number in the gutter.
 vim.opt.relativenumber = true                                       -- Relative line number
-vim.opt.scrolloff = 8
 vim.opt.sidescrolloff = 8
 vim.opt.shiftround = true                                           -- Round indentation to shiftwidth
 vim.opt.shiftwidth = 4                                              -- Number of spaces a tab counts for when converting tabs to spaces
diff --git a/nvim/lua/ui2.lua b/nvim/lua/ui2.lua
new file mode 100644
index 0000000..351acb3
--- /dev/null
+++ b/nvim/lua/ui2.lua
@@ -0,0 +1,8 @@
+-- Enables Ui2 to display the previously cmdline displayed messages in a different format
+-- Use the shortcut `g<` to load the messages in a buffer
+require('vim._core.ui2').enable {
+    enable = true,
+    msg = {
+        targets = "msg", -- Displays in a floating text format
+    }
+}