diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
index 9f9e4ef..5ee5598 100644
--- a/alacritty/.config/alacritty/alacritty.yml
+++ b/alacritty/.config/alacritty/alacritty.yml
@@ -2,7 +2,7 @@
 env:
   TERM: xterm-256color
 
-background_opacity: 0.95
+background_opacity: 1.0
 
 window:
   padding:
@@ -28,7 +28,7 @@ font:
   # Normal (roman) font face
   normal:
 
-    family: Consolas ligaturized v2
+    family: Fira Code
 
     # The `style` can be specified to pick a specific face.
     style: Normal
@@ -36,7 +36,7 @@ font:
   # Bold font face
   bold:
 
-    family: Consolas ligaturized v2
+    family: Fira Code
 
     # The `style` can be specified to pick a specific face.
     style: Bold
@@ -49,7 +49,7 @@ font:
   # Bold italic font face
   bold_italic:
 
-    family: Consolas ligaturized v2
+    family: Fira Code
 
     # The `style` can be specified to pick a specific face.
     style: Bold Italic
@@ -67,32 +67,29 @@ font:
 draw_bold_text_with_bright_colors: true
 
 colors:
-  # Default colors
   primary:
-    background: '0x222222'
-    foreground: '0xebdbb2'
+    background: '0x181818'
+    foreground: '0xdfbf8e'
 
-  # Normal colors
   normal:
-    black:   '0x282828'
-    red:     '0xcc241d'
-    green:   '0x98971a'
-    yellow:  '0xd79921'
-    blue:    '0x458588'
-    magenta: '0xb16286'
-    cyan:    '0x689d6a'
-    white:   '0xa89984'
-
-  # Bright colors
+    black:   '0x665c54'
+    red:     '0xea6962'
+    green:   '0xa9b665'
+    yellow:  '0xe78a4e'
+    blue:    '0x7daea3'
+    magenta: '0xd3869b'
+    cyan:    '0x89b482'
+    white:   '0xdfbf8e'
+
   bright:
     black:   '0x928374'
-    red:     '0xfb4934'
-    green:   '0xb8bb26'
-    yellow:  '0xfabd2f'
-    blue:    '0x83a598'
+    red:     '0xea6962'
+    green:   '0xa9b665'
+    yellow:  '0xe3a84e'
+    blue:    '0x7daea3'
     magenta: '0xd3869b'
-    cyan:    '0x8ec07c'
-    white:   '0xebdbb2'
+    cyan:    '0x89b482'
+    white:   '0xdfbf8e'
 
 cursor:
   # Values for `style`:
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 3875d3e..2b407e5 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -1,22 +1,9 @@
-"		NEO- 
-"    ##############..... ##############   
-"    ##############......##############   
-"      ##########..........##########     
-"      ##########........##########       
-"      ##########.......##########        
-"      ##########.....##########..        
-"      ##########....##########.....      
-"    ..##########..##########.........    
-"  ....##########.#########.............  
-"    ..################JJJ............    
-"      ################.............      
-"      ##############.JJJ.JJJJJJJJJJ      
-"      ############...JJ...JJ..JJ  JJ     
-"      ##########....JJ...JJ..JJ  JJ      
-"      ########......JJJ..JJJ JJJ JJJ     
-"      ######    .........                
-"                  .....                  
-"                    .                    
+"  _   _         __     ___           
+" | \ | | ___  __\ \   / (_)_ __ ___  
+" |  \| |/ _ \/ _ \ \ / /| | '_ ` _ \ 
+" | |\  |  __/ (_) \ V / | | | | | | |
+" |_| \_|\___|\___/ \_/  |_|_| |_| |_|
+
 
 call plug#begin('~/.config/nvim/plugged')
 	" Misc
@@ -38,6 +25,7 @@ call plug#begin('~/.config/nvim/plugged')
 	Plug 'OmniSharp/omnisharp-vim'
 	" Themes
 	Plug 'ellisonleao/gruvbox.nvim'
+	Plug 'sainnhe/gruvbox-material'
 	Plug 'projekt0n/github-nvim-theme'
 	" Lua Line
 	Plug 'nvim-lualine/lualine.nvim'
@@ -47,7 +35,12 @@ call plug#end()
 set nocompatible
 set showmatch 	
 set ignorecase	
+
+" Mouse
 set mouse=a	
+" map <ScrollWheelUp> <C-Y>
+" map <ScrollWheelDown> <C-E>
+
 set hlsearch
 set autoindent	
 filetype plugin indent on  
@@ -72,14 +65,19 @@ let g:ruby_recommended_style = 0
 set clipboard+=unnamedplus
 
 " Theme
-set background=dark
-colors gruvbox 
+" set background=dark
+colorscheme gruvbox-material
 let &showbreak = '↳ '
 set laststatus=0 ruler
 set rnu nu
 
 hi Normal guibg=NONE ctermbg=NONE
-hi StatusLine ctermbg=NONE ctermfg=NONE
+hi EndOfBuffer guibg=NONE ctermbg=NONE
+hi TabLine guibg=NONE ctermbg=NONE
+" hi TabLineSel ctermfg=223 guibg=NONE ctermbg=NONE 
+hi TabLineFill guibg=NONE ctermbg=NONE
+
+hi StatusLine ctermbg=NONE guibg=NONE
 
 highlight clear LineNr
 highlight LineNr ctermfg=NONE ctermbg=NONE
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index 2edf73f..315db8b 100644
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -2,7 +2,7 @@
 #compositing-foreground = over
 
 [colors]
-background = #222222
+background = #181818
 foreground = #ebdbb2
 foreground2 = #77ebdbb2
 line = #bbb