diff --git a/nvim/lua/psoxizsh/init.lua b/nvim/lua/psoxizsh/init.lua
index 1f4be77..3f1cc48 100644
--- a/nvim/lua/psoxizsh/init.lua
+++ b/nvim/lua/psoxizsh/init.lua
@@ -7,7 +7,7 @@ local function psoxizsh_early_config()
 
   -- Set global color scheme var
   if not g.my_color_scheme then
-    g.my_color_scheme = 'one'
+    g.my_color_scheme = 'onedarkpro'
   end
 
   -- Color settings
diff --git a/nvim/lua/psoxizsh/plugins/config/onedark.lua b/nvim/lua/psoxizsh/plugins/config/onedark.lua
new file mode 100644
index 0000000..d9ab1c4
--- /dev/null
+++ b/nvim/lua/psoxizsh/plugins/config/onedark.lua
@@ -0,0 +1,21 @@
+return function()
+  local odp, util = require 'onedarkpro', require 'psoxizsh.util'
+
+  local defaults = {
+    plugins = { all = true },
+    styles = {
+      comments = 'italic',
+    },
+    options = {
+      bold            = true,
+      italic          = true,
+      underline       = true,
+      undercurl       = true,
+    },
+  }
+
+  if not vim.g.my_color_scheme then vim.g.my_color_scheme = 'onedarkpro' end
+
+  odp.setup(util.mconfig('config.onedark', defaults))
+end
+
diff --git a/nvim/lua/psoxizsh/plugins/plug.lua b/nvim/lua/psoxizsh/plugins/plug.lua
index f4263b2..bda15a2 100644
--- a/nvim/lua/psoxizsh/plugins/plug.lua
+++ b/nvim/lua/psoxizsh/plugins/plug.lua
@@ -18,6 +18,11 @@ local plugins = {
       as = 'vimp'
   },
 
+  -- Color themes
+  { 'olimorris/onedarkpro.nvim',
+      config = require 'psoxizsh.plugins.config.onedark'
+  },
+
   -- Text alignment
   { 'junegunn/vim-easy-align' },
   { 'tmsvg/pear-tree',
@@ -104,15 +109,10 @@ local plugins = {
   { 'junegunn/fzf.vim',
       config = require 'psoxizsh.plugins.config.fzf'
   },
+  { 'romainl/vim-cool' },
   { 'adelarsq/vim-matchit' },
   { 'mox-mox/vim-localsearch' },
 
-  -- Color themes
-  { 'rakr/vim-one',
-      config = function() vim.cmd(string.format('colorscheme %s', vim.g.my_color_scheme or 'one')) end
-  },
-  { 'romainl/vim-cool' },
-
   -- Tmux integration for pane movement
   { 'christoomey/vim-tmux-navigator',
       keys = { '<C-h>', '<C-j>', '<C-k>', '<C-l>' },