diff --git a/nvim/init.vim b/nvim/init.vim
index 10fb197..287b7e9 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -2,47 +2,67 @@ call plug#begin('~/local/share/nvim/plugged')
 
 Plug 'itchyny/lightline.vim'
 Plug 'editorconfig/editorconfig-vim'
-Plug 'itchyny/lightline.vim'
+
+" Fzf
 Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
 Plug 'mattn/emmet-vim'
+
+" NERDTree
 Plug 'scrooloose/nerdtree'
+
+" Improvements
 Plug 'terryma/vim-multiple-cursors'
 Plug 'tpope/vim-eunuch'
 Plug 'tpope/vim-surround'
 Plug 'scrooloose/syntastic'
+Plug 'jiangmiao/auto-pairs'
+
+"Airline
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
 Plug 'prabirshrestha/vim-lsp'
+
+" Themes
 Plug 'tomasr/molokai'
+Plug 'gko/vim-coloresque'
+Plug 'dracula/vim', { 'as': 'dracula' }
+Plug 'joshdick/onedark.vim'
+
+" Lang. Support
 Plug 'fatih/vim-go'
 Plug 'artur-shaik/vim-javacomplete2'
 Plug 'Valloric/YouCompleteMe', { 'do': './install.py' }
-Plug 'gko/vim-coloresque'
+Plug 'rust-lang/rust.vim'
 Plug 'preservim/nerdcommenter'
+
+" Writing
 Plug 'junegunn/goyo.vim'
-Plug 'rust-lang/rust.vim'
 Plug 'lervag/vimtex'
 Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' }
+
+"Zoxide
 Plug 'nanotee/zoxide.vim'
+
+" Vim Wiki
 Plug 'vimwiki/vimwiki'
 Plug 'mattn/calendar-vim'
+
+" Animate
 Plug 'camspiers/animate.vim'
 Plug 'camspiers/lens.vim'
+
 " Better Syntax Support
 Plug 'sheerun/vim-polyglot'
-" File Explorer
-Plug 'scrooloose/NERDTree'
-" Auto pairs for '(' '[' '{'
-Plug 'jiangmiao/auto-pairs'
 
 " Git
 Plug 'airblade/vim-gitgutter'
 Plug 'tpope/vim-fugitive'
 call plug#end()
 
-let g:molokai_original = 1
-let g:airline_theme='molokai'
+
+"let g:molokai_original = 1
+let g:airline_theme='onedark'
 let g:ale_enable=0
 syntax on
 filetype plugin indent on
@@ -51,11 +71,11 @@ set softtabstop=4
 set tabstop=4
 set expandtab
 set number relativenumber
-colorscheme monokai
+colorscheme onedark
 set nocompatible
 
 let g:livepreview_previewer = 'zathura'
-
+set mouse=a
 " Map Leader
 let mapleader = ","
 
@@ -71,10 +91,12 @@ let NERDTreeMapOpenInTab='<ENTER>'
 
 let g:fzf_nvim_statusline = 0 " disable statusline overwriting
 
-"remaps
+"remaps for fzf
 nnoremap <silent> <leader><space> :Files<CR>
 nnoremap <silent> <leader>w :Windows<CR>
 nnoremap <silent> <leader>h :History<CR>
+nnoremap <silent> <leader>g<space> :GFiles<CR>
+nnoremap <silent> <leader>gs :GFiles?<CR>
 
 " Switching windows
 nnoremap <A-h> <C-w>h
@@ -82,7 +104,7 @@ nnoremap <A-j> <C-w>j
 nnoremap <A-k> <C-w>k
 nnoremap <A-l> <C-w>l
 
-" 
+" Move tabs
 nnoremap <A-J> :tabp<CR>
 nnoremap <A-K> :tabn<CR>