diff --git a/init.lua b/init.lua
index fb0252cc..5e9e5679 100644
--- a/init.lua
+++ b/init.lua
@@ -129,28 +129,11 @@ require('lazy').setup({
     },
   },
 
-  {
-    -- Theme inspired by Atom
-    'navarasu/onedark.nvim',
-    priority = 1000,
-    config = function()
-      vim.cmd.colorscheme 'onedark'
-    end,
-  },
+  -- Theme related configs go here
+  require 'kickstart.plugins.theme',
 
-  {
-    -- Set lualine as statusline
-    'nvim-lualine/lualine.nvim',
-    -- See `:help lualine.txt`
-    opts = {
-      options = {
-        icons_enabled = false,
-        theme = 'onedark',
-        component_separators = '|',
-        section_separators = '',
-      },
-    },
-  },
+  -- Status line related configs go here
+  require 'kickstart.plugins.statusline',
 
   {
     -- Add indentation guides even on blank lines
diff --git a/lua/kickstart/plugins/statusline.lua b/lua/kickstart/plugins/statusline.lua
new file mode 100644
index 00000000..cfc8cac7
--- /dev/null
+++ b/lua/kickstart/plugins/statusline.lua
@@ -0,0 +1,14 @@
+return  {
+  -- Set lualine as statusline
+  'nvim-lualine/lualine.nvim',
+  -- See `:help lualine.txt`
+  opts = {
+    options = {
+      icons_enabled = false,
+      theme = 'onedark',
+      component_separators = '|',
+      section_separators = '',
+    },
+  },
+}
+
diff --git a/lua/kickstart/plugins/theme.lua b/lua/kickstart/plugins/theme.lua
new file mode 100644
index 00000000..2b4313ea
--- /dev/null
+++ b/lua/kickstart/plugins/theme.lua
@@ -0,0 +1,9 @@
+return {
+  -- Theme inspired by Atom
+  'navarasu/onedark.nvim',
+  priority = 1000,
+  config = function()
+    vim.cmd.colorscheme 'onedark'
+  end,
+}
+