diff --git a/.Xresources b/.Xresources
index 15d354a..d8c68bd 100644
--- a/.Xresources
+++ b/.Xresources
@@ -1,9 +1,9 @@
-!#include "/home/hate/.colors/nord"
+#include "/home/hate/.colors/nord"
 
 !! Set the background, foreground and cursor colors as below:
-*.background: #282828
-*.foreground: white
-*.cursorColor: white
+!*.background: #282828
+!*.foreground: white
+!*.cursorColor: white
 
 !/* !! gruvbox: */
 !/* *.color0: #1d2021 */
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 54bd4c6..fea405b 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -1,70 +1,8 @@
-set nocompatible            " Disable compatibility to old-time vi
-set showmatch               " Show matching brackets.
-set ignorecase              " Do case insensitive matching
-set mouse=v                 " middle-click paste with mouse
-set hlsearch                " highlight search results
-set tabstop=4               " number of columns occupied by a tab character
-set softtabstop=4           " see multiple spaces as tabstops so <BS> does the right thing
-set expandtab               " converts tabs to white space
-set shiftwidth=4            " width for autoindents
-set autoindent              " indent a new line the same amount as the line just typed
-set number                  " add line numbers
-set wildmode=longest,list   " get bash-like tab completions
-set autoread                " refresh file
-if (has("termguicolors"))
- set termguicolors
-endif
-syntax on
-
-" set the runtime path to include Vundle and initialize
-set rtp+=~/.config/nvim/bundle/Vundle.vim
-call vundle#begin('~/.config/nvim/bundle')
-Plugin 'VundleVim/Vundle.vim'
-call vundle#end()
-
-" allows auto-indenting depending on file type
-filetype plugin indent on
-
-call plug#begin('~/.local/share/nvim/site/autoload')
-Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
-Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
-Plug 'dylanaraps/wal'
-Plug 'PotatoesMaster/i3-vim-syntax' 
-Plug 'Xuyuanp/nerdtree-git-plugin'
-Plug 'mhinz/vim-startify'
-Plug 'tpope/vim-fugitive'
-Plug 'tpope/vim-sensible'
-Plug 'tpope/vim-obsession'
-Plug 'junegunn/gv.vim'
-Plug 'junegunn/goyo.vim'
-Plug 'edkolev/tmuxline.vim'
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
-Plug 'chrisbra/colorizer'
-Plug 'chase/focuspoint-vim'
-Plug 'liuchengxu/space-vim-theme'
-Plug 'kadekillary/Turtles'
-Plug 'arcticicestudio/nord-vim'
-Plug 'whatyouhide/vim-gotham'
-Plug 'deviantfero/wpgtk.vim'
-Plug 'itchyny/landscape.vim'
-call plug#end()
-
-map <C-n> :NERDTreeToggle<CR>
-
-colorscheme nord
-
-let g:airline_powerline_fonts = 1
-let g:airline_theme='nord'
-let g:tmuxline_preset = {
-      \'a'    : '#S',
-      \'b'    : '#W',
-      \'c'    : ['#(~/.config/Scripts/showip)'],
-      \'win'  : ['#I', '#W'],
-      \'cwin' : ['#I', '#W', '#F'],
-      \'y'    : ['%R', '%a', '%Y'],
-      \'z'    : '#H'}
-
-" Run xrdb whenever Xdefaults or Xresources are updated.
-autocmd BufWritePost *Xresources,*Xdefaults !xrdb %
-
+" This script contains general neovim settings 
+source $HOME/.config/nvim/config/plugins.vim
+" This script contains  a list of Vim-Plugged plugins 
+source $HOME/.config/nvim/config/main.vim
+" This script contains plugin specific settings
+source $HOME/.config/nvim/config/plugin-settings.vim
+" This script contains mappings
+source $HOME/.config/nvim/config/mappings.vim