diff --git a/config/nvim/.config/nvim/after/ftplugin/lua.vim b/config/nvim/.config/nvim/after/ftplugin/lua.vim
new file mode 100644
index 0000000..1bb0a62
--- /dev/null
+++ b/config/nvim/.config/nvim/after/ftplugin/lua.vim
@@ -0,0 +1 @@
+set sw=2 ts=2
diff --git a/config/nvim/.config/nvim/init.lua b/config/nvim/.config/nvim/init.lua
index 05230d2..5e1f86a 100644
--- a/config/nvim/.config/nvim/init.lua
+++ b/config/nvim/.config/nvim/init.lua
@@ -1,27 +1,10 @@
 -- init.lua --
 
 -- general vim settings
-require('settings')
-
--- vim keymaps
-require('keymaps')
-
--- package manager (packer.nvim)
-require('plugins')
+require('config.settings') -- general vim settings
+require('config.keymaps') -- general vim keymaps
+require('config.plugins') -- loads plugins (packer)
+require('config.platform_specific') -- platform specific settings (Win32, Mac, Linux)
 
 -- plugin configurations
 require('plugin-config')
-
--- platform/os specific stuff
-if vim.fn.has('win32') then
-  vim.cmd([[
-    " WSL yank support
-    let s:clip = '/mnt/c/Windows/System32/clip.exe'  " change this path according to your mount point
-    if executable(s:clip)
-        augroup WSLYank
-            autocmd!
-            autocmd TextYankPost * if v:event.operator ==# 'y' | call system(s:clip, @0) | endif
-        augroup END
-    endif
-  ]])
-end
diff --git a/config/nvim/.config/nvim/lua/keymaps.lua b/config/nvim/.config/nvim/lua/config/keymaps.lua
similarity index 100%
rename from config/nvim/.config/nvim/lua/keymaps.lua
rename to config/nvim/.config/nvim/lua/config/keymaps.lua
diff --git a/config/nvim/.config/nvim/lua/config/platform_specific.lua b/config/nvim/.config/nvim/lua/config/platform_specific.lua
new file mode 100644
index 0000000..f47bc87
--- /dev/null
+++ b/config/nvim/.config/nvim/lua/config/platform_specific.lua
@@ -0,0 +1,13 @@
+-- platform/os specific stuff
+if vim.fn.has('win32') then
+  vim.cmd([[
+    " WSL yank support
+    let s:clip = '/mnt/c/Windows/System32/clip.exe'  " change this path according to your mount point
+    if executable(s:clip)
+        augroup WSLYank
+            autocmd!
+            autocmd TextYankPost * if v:event.operator ==# 'y' | call system(s:clip, @0) | endif
+        augroup END
+    endif
+  ]])
+end
diff --git a/config/nvim/.config/nvim/lua/plugins.lua b/config/nvim/.config/nvim/lua/config/plugins.lua
similarity index 92%
rename from config/nvim/.config/nvim/lua/plugins.lua
rename to config/nvim/.config/nvim/lua/config/plugins.lua
index bd27aed..8b31fbe 100644
--- a/config/nvim/.config/nvim/lua/plugins.lua
+++ b/config/nvim/.config/nvim/lua/config/plugins.lua
@@ -69,11 +69,7 @@ require('packer').startup(function(use)
   use { 'junegunn/fzf.vim' }
 
   -- colorschemes
-  use({
-    'rose-pine/neovim',
-    as = 'rose-pine',
-    config = function()
-      vim.cmd('colorscheme rose-pine')
-    end
-  })
+  -- use 'rose-pine/neovim'
+  use 'w0ng/vim-hybrid'
+
 end)
diff --git a/config/nvim/.config/nvim/lua/settings.lua b/config/nvim/.config/nvim/lua/config/settings.lua
similarity index 100%
rename from config/nvim/.config/nvim/lua/settings.lua
rename to config/nvim/.config/nvim/lua/config/settings.lua
diff --git a/config/nvim/.config/nvim/lua/plugin-config/colorscheme.lua b/config/nvim/.config/nvim/lua/plugin-config/colorscheme.lua
new file mode 100644
index 0000000..72c5ea7
--- /dev/null
+++ b/config/nvim/.config/nvim/lua/plugin-config/colorscheme.lua
@@ -0,0 +1,4 @@
+local ok, _ = pcall(vim.cmd, 'colorscheme hybrid')
+if not ok then
+  vim.cmd 'colorscheme delek' -- if the above fails, then use default
+end
diff --git a/config/nvim/.config/nvim/lua/plugin-config/keybinds/fzf.lua b/config/nvim/.config/nvim/lua/plugin-config/fzf.lua
similarity index 100%
rename from config/nvim/.config/nvim/lua/plugin-config/keybinds/fzf.lua
rename to config/nvim/.config/nvim/lua/plugin-config/fzf.lua
diff --git a/config/nvim/.config/nvim/lua/plugin-config/init.lua b/config/nvim/.config/nvim/lua/plugin-config/init.lua
index 7d0b86e..b713d51 100644
--- a/config/nvim/.config/nvim/lua/plugin-config/init.lua
+++ b/config/nvim/.config/nvim/lua/plugin-config/init.lua
@@ -1,21 +1,25 @@
 -- plugin-config/init.lua
 
+-- * LSP, Completion and TreeSitter * --
 -- lsp
 require('plugin-config.lsp')
-
 -- completion
 require('plugin-config.cmp')
-
--- treesitter (syntax highlighting)
+-- treesitter (tree based syntax highlighting)
 require('plugin-config.nvim-treesitter')
 
+-- * File explorer and Fuzzy Finder * --
 -- nvim-tree
 require('plugin-config.nvim-tree')
+-- fzf (fuzzy finder)
+require('plugin-config.fzf')
 
+-- * Git Integration * --
 -- gitsigns
 require('plugin-config.gitsigns')
+-- vim-fugitive (git plugin)
+require('plugin-config.vim-fugitive')
 
--- plugin keybinds
-require('plugin-config.keybinds.vim-fugitive')
-require('plugin-config.keybinds.fzf')
-require('plugin-config.keybinds.nvim-tree')
+
+-- colorscheme
+require('plugin-config.colorscheme')
diff --git a/config/nvim/.config/nvim/lua/plugin-config/keybinds/nvim-tree.lua b/config/nvim/.config/nvim/lua/plugin-config/keybinds/nvim-tree.lua
deleted file mode 100644
index 00b3e81..0000000
--- a/config/nvim/.config/nvim/lua/plugin-config/keybinds/nvim-tree.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- NvimTree
-vim.keymap.set('n', '<leader>e', ':NvimTreeToggle<cr>')
diff --git a/config/nvim/.config/nvim/lua/plugin-config/nvim-tree.lua b/config/nvim/.config/nvim/lua/plugin-config/nvim-tree.lua
index 92353b9..624bfcf 100644
--- a/config/nvim/.config/nvim/lua/plugin-config/nvim-tree.lua
+++ b/config/nvim/.config/nvim/lua/plugin-config/nvim-tree.lua
@@ -1 +1,3 @@
+-- NvimTree
 require('nvim-tree').setup()
+vim.keymap.set('n', '<leader>e', ':NvimTreeToggle<cr>')
diff --git a/config/nvim/.config/nvim/lua/plugin-config/nvim-treesitter.lua b/config/nvim/.config/nvim/lua/plugin-config/nvim-treesitter.lua
index 2e338e2..22226dc 100644
--- a/config/nvim/.config/nvim/lua/plugin-config/nvim-treesitter.lua
+++ b/config/nvim/.config/nvim/lua/plugin-config/nvim-treesitter.lua
@@ -4,10 +4,10 @@ require('nvim-treesitter.configs').setup {
   -- Add languages to be installed here that you want installed for treesitter
   ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'typescript', 'help' },
 
-  highlight = { enable = true },
+  highlight = { enable = false },
   indent = { enable = true },
   incremental_selection = {
-    enable = true,
+    enable = false,
     keymaps = {
       init_selection = '<c-space>',
       node_incremental = '<c-space>',
@@ -60,3 +60,5 @@ require('nvim-treesitter.configs').setup {
     },
   },
 }
+
+vim.keymap.set('n', '<leader>td', 'TSDisable highlight')
diff --git a/config/nvim/.config/nvim/lua/plugin-config/keybinds/vim-fugitive.lua b/config/nvim/.config/nvim/lua/plugin-config/vim-fugitive.lua
similarity index 100%
rename from config/nvim/.config/nvim/lua/plugin-config/keybinds/vim-fugitive.lua
rename to config/nvim/.config/nvim/lua/plugin-config/vim-fugitive.lua