diff --git a/init.lua b/init.lua
index 0e88fd51..4e10aa1f 100644
--- a/init.lua
+++ b/init.lua
@@ -91,7 +91,7 @@ vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 
 -- Set to true if you have a Nerd Font installed and selected in the terminal
-vim.g.have_nerd_font = false
+vim.g.have_nerd_font = true
 
 -- [[ Setting options ]]
 -- See `:help vim.opt`
@@ -790,6 +790,7 @@ require('lazy').setup({
       -- Like many other themes, this one has different styles, and you could load
       -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
       vim.cmd.colorscheme 'tokyonight-night'
+      -- vim.cmd.colorscheme 'default'
 
       -- You can configure highlights by doing something like:
       --vim.cmd.hi 'Comment gui=none'
@@ -892,7 +893,7 @@ require('lazy').setup({
   --
   --  Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
   --    For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
-  -- { import = 'custom.plugins' },
+  { import = 'custom.plugins' },
 }, {
   ui = {
     -- If you are using a Nerd Font: set icons to an empty table which will use the
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index be0eb9d8..200dc172 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -2,4 +2,119 @@
 --  I promise not to create any merge conflicts in this directory :)
 --
 -- See the kickstart.nvim README for more information
-return {}
+return {
+  {
+    'amitds1997/remote-nvim.nvim',
+    version = '*', -- Pin to GitHub releases
+    dependencies = {
+      'nvim-lua/plenary.nvim', -- For standard functions
+      'MunifTanjim/nui.nvim', -- To build the plugin UI
+      'nvim-telescope/telescope.nvim', -- For picking between different remote methods
+    },
+    config = function()
+      require('remote-nvim').setup {
+        server = 'localhost',
+        port = 8765,
+        -- additional configuration options
+      }
+    end,
+  },
+
+  {
+    'yetone/avante.nvim',
+    event = 'VeryLazy',
+    build = 'make',
+    opts = {
+      -- add any opts here
+    },
+    dependencies = {
+      'nvim-tree/nvim-web-devicons',
+      'echasnovski/mini.icons',
+      'stevearc/dressing.nvim',
+      'nvim-lua/plenary.nvim',
+      'MunifTanjim/nui.nvim',
+      -- The below is optional, make sure to setup it properly if you have lazy=true
+      {
+        'MeanderingProgrammer/render-markdown.nvim',
+        opts = {
+          file_types = { 'markdown', 'Avante' },
+        },
+        ft = { 'markdown', 'Avante' },
+      },
+    },
+    config = function()
+      local provider = 'openai'
+
+      -- Configuration specific to Claude (replace with OpenAI if necessary)
+      local openai = {
+        endpoint = 'https://api.openai.com/v1',
+        model = 'gpt-4o', -- Replace with the desired OpenAI model
+        temperature = 0.7,
+        max_tokens = 4096,
+      }
+
+      -- Key mappings
+      local mappings = {
+        ask = '<leader>aa',
+        edit = '<leader>ae',
+        refresh = '<leader>ar',
+        diff = {
+          ours = 'co',
+          theirs = 'ct',
+          none = 'c0',
+          both = 'cb',
+          next = ']x',
+          prev = '[x',
+        },
+        jump = {
+          next = ']]',
+          prev = '[[',
+        },
+        submit = {
+          normal = '<CR>',
+          insert = '<C-s>',
+        },
+        toggle = {
+          debug = '<leader>ad',
+          hint = '<leader>ah',
+        },
+      }
+
+      -- UI and window settings
+      local windows = {
+        wrap = true, -- similar to vim.o.wrap
+        width = 30, -- default % based on available width
+        sidebar_header = {
+          align = 'center', -- left, center, right for title
+          rounded = true,
+        },
+      }
+
+      -- Highlights for diffs
+      local highlights = {
+        diff = {
+          current = 'DiffText',
+          incoming = 'DiffAdd',
+        },
+      }
+
+      -- Diff configuration
+      local diff = {
+        debug = false,
+        autojump = true,
+        list_opener = 'copen',
+      }
+
+      -- Set up Avante.nvim with the OpenAI provider and custom configurations
+      require('avante').setup {
+        provider = provider,
+        openai = openai,
+        mappings = mappings,
+        hints = { enabled = true },
+        windows = windows,
+        highlights = highlights,
+        diff = diff,
+      }
+    end,
+  },
+}