diff --git a/init.lua b/init.lua
index d0f7607d..21282557 100644
--- a/init.lua
+++ b/init.lua
@@ -88,7 +88,7 @@ require('lazy').setup({
 
       -- Useful status updates for LSP
       -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
-      { 'j-hui/fidget.nvim', opts = {} },
+      { 'j-hui/fidget.nvim',       opts = {} },
 
       -- Additional lua configuration, makes nvim stuff amazing!
       'folke/neodev.nvim',
@@ -113,7 +113,7 @@ require('lazy').setup({
   },
 
   -- Useful plugin to show you pending keybinds.
-  { 'folke/which-key.nvim', opts = {} },
+  { 'folke/which-key.nvim',  opts = {} },
   {
     -- Adds git related signs to the gutter, as well as utilities for managing changes
     'lewis6991/gitsigns.nvim',
@@ -190,11 +190,10 @@ require('lazy').setup({
   },
 
   {
-    -- Theme inspired by Atom
-    'navarasu/onedark.nvim',
+    'rmehri01/onenord.nvim',
     priority = 1000,
     config = function()
-      vim.cmd.colorscheme 'onedark'
+      vim.cmd.colorscheme 'onenord'
     end,
   },
 
@@ -205,10 +204,17 @@ require('lazy').setup({
     opts = {
       options = {
         icons_enabled = false,
-        theme = 'onedark',
+        theme = 'onenord',
         component_separators = '|',
         section_separators = '',
       },
+      sections = {
+        lualine_c = {
+          {
+            'filename', path = 4
+          }
+        }
+      }
     },
   },
 
@@ -231,6 +237,13 @@ require('lazy').setup({
     dependencies = {
       'nvim-lua/plenary.nvim',
       -- Fuzzy Finder Algorithm which requires local dependencies to be built.
+      sections = {
+        lualine_c = {
+          {
+            'filename', path = 4
+          }
+        }
+      }
       -- Only load if `make` is available. Make sure you have the system
       -- requirements installed.
       {
@@ -329,6 +342,9 @@ vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnos
 vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
 vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
 
+-- Custom Remaps
+require 'custom.zwergius.remap'
+
 -- [[ Highlight on yank ]]
 -- See `:help vim.highlight.on_yank()`
 local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
diff --git a/lazy-lock.json b/lazy-lock.json
index 27a9d279..7613a6d2 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -2,9 +2,10 @@
   "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
   "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "conform.nvim": { "branch": "master", "commit": "3d59cbd01a4b74124c5a6fb23b8cc63e5c2db3d5" },
-  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
+  "fidget.nvim": { "branch": "main", "commit": "3a93300c076109d86c7ce35ec67a8034ae6ba9db" },
   "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" },
   "gitsigns.nvim": { "branch": "main", "commit": "c5ff7628e19a47ec14d3657294cc074ecae27b99" },
   "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" },
diff --git a/lua/custom/plugins/lualine.lua b/lua/custom/plugins/lualine.lua
deleted file mode 100644
index 961e93ab..00000000
--- a/lua/custom/plugins/lualine.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-return {
-	-- Set lualine as statusline
-	'nvim-lualine/lualine.nvim',
-	-- See `:help lualine.txt`
-	opts = {
-		options = {
-			icons_enabled = false,
-			theme = 'onenord',
-			component_separators = '|',
-			section_separators = '',
-		},
-		sections = {
-			lualine_c = {
-				{
-					'filename', path = 4
-				}
-			}
-		}
-	},
-}
diff --git a/lua/custom/plugins/theme.lua b/lua/custom/plugins/theme.lua
deleted file mode 100644
index 02f4206e..00000000
--- a/lua/custom/plugins/theme.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-return {
-	'rmehri01/onenord.nvim',
-	priority = 1000,
-	config = function()
-		vim.cmd.colorscheme 'onenord'
-	end,
-}