diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
index 4c6cc54..0faf9b5 100644
--- a/alacritty/.config/alacritty/alacritty.yml
+++ b/alacritty/.config/alacritty/alacritty.yml
@@ -3,7 +3,7 @@ env:
   TERM: xterm-256color
 
 window:
-  opacity: 0.9
+  background_opacity: 1.0
   padding:
     x: 8
     y: 8
@@ -27,15 +27,15 @@ font:
   # Normal (roman) font face
   normal:
 
-    family: Fira Code
+    family: Consolas ligaturized v2
 
     # The `style` can be specified to pick a specific face.
-    style: Bold
+    style: Normal
 
   # Bold font face
   bold:
 
-    family: Fira Code
+    family: Consolas ligaturized v2
 
     # The `style` can be specified to pick a specific face.
     style: Bold
@@ -48,13 +48,13 @@ font:
   # Bold italic font face
   bold_italic:
 
-    family: Fira Code
+    family: Consolas ligaturized v2
 
     # The `style` can be specified to pick a specific face.
     style: Bold Italic
 
   # Point size
-  size: 9
+  size: 10
 
   # Offset is the extra space around each character. `offset.y` can be thought of
   # as modifying the line spacing, and `offset.x` as modifying the letter spacing.
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 06ff105..3875d3e 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -19,22 +19,29 @@
 "                    .                    
 
 call plug#begin('~/.config/nvim/plugged')
+	" Misc
+	Plug 'vim-scripts/fountain.vim'
+	Plug 'preservim/nerdtree'
+	Plug 'numToStr/Comment.nvim'
+	" Lang support
 	Plug 'neoclide/coc.nvim', {'branch': 'release'}
 	Plug 'tpope/vim-markdown'
 	Plug 'ap/vim-css-color' 
-	Plug 'vim-scripts/fountain.vim'
-	Plug 'preservim/nerdtree'
+	Plug 'axelf4/vim-haskell'
+	Plug 'pantharshit00/vim-prisma'
+	Plug 'mikelue/vim-maven-plugin'
+	Plug 'sheerun/vim-polyglot'
+	Plug 'ngmy/vim-rubocop'
+	Plug 'lervag/vimtex' 
 	Plug 'arakashic/chromatica.nvim'
 	Plug 'slim-template/vim-slim'
 	Plug 'OmniSharp/omnisharp-vim'
-	Plug 'ngmy/vim-rubocop'
-	Plug 'lervag/vimtex' 
-	Plug 'mikelue/vim-maven-plugin'
-	Plug 'sheerun/vim-polyglot'
-	Plug 'projekt0n/github-nvim-theme'
-	Plug 'pantharshit00/vim-prisma'
-	Plug 'axelf4/vim-haskell'
+	" Themes
 	Plug 'ellisonleao/gruvbox.nvim'
+	Plug 'projekt0n/github-nvim-theme'
+	" Lua Line
+	Plug 'nvim-lualine/lualine.nvim'
+	Plug 'kyazdani42/nvim-web-devicons'
 call plug#end() 
 
 set nocompatible
@@ -69,7 +76,7 @@ set background=dark
 colors gruvbox 
 let &showbreak = '↳ '
 set laststatus=0 ruler
-set nu
+set rnu nu
 
 hi Normal guibg=NONE ctermbg=NONE
 hi StatusLine ctermbg=NONE ctermfg=NONE
@@ -109,3 +116,10 @@ let g:vimtex_view_general_options = '--unique file:@pdf\#src:@line@tex'
 " following line. The default is usually fine and is the symbol "\".
 let maplocalleader = ","
 set title
+
+
+" Lua crap
+lua << END
+require('lualine').setup()
+require('Comment').setup()
+END
diff --git a/picom/.config/picom/picom.conf b/picom/.config/picom/picom.conf
index 964ef94..4146535 100644
--- a/picom/.config/picom/picom.conf
+++ b/picom/.config/picom/picom.conf
@@ -187,7 +187,7 @@ blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1";
 blur-background-exclude = [
   #"window_type = 'dock'",
   "window_type = 'desktop'",
-  "window_type = 'alacritty'",
+  #"window_type = 'alacritty'",
   "window_type = 'firefox'",
   "_GTK_FRAME_EXTENTS@:c"
 ];
@@ -402,21 +402,21 @@ log-level = "warn";
 #################################
 #             Corners           #
 #################################
-corner-radius = 8.0;
+corner-radius = 0.0;
 rounded-corners-exclude = [
   #"window_type = 'normal'",
 #  "class_g = 'awesome'",
 #  "class_g = 'URxvt'",
 #  "class_g = 'XTerm'",
 #  "class_g = 'kitty'",
-   "class_g = 'Alacritty'",
+#   "class_g = 'Alacritty'",
    "class_g = 'Polybar'",
 #  "class_g = 'code-oss'",
 #  "class_g = 'TelegramDesktop'",
    "class_g = 'firefox'",
 #  "class_g = 'Thunderbird'"
 ];
-round-borders = 1;
+round-borders = 0;
 round-borders-exclude = [
   #"class_g = 'TelegramDesktop'",
 ];
diff --git a/zsh/.zshrc b/zsh/.zshrc
index d909954..707fb24 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -8,7 +8,7 @@ export ZSH="/home/elal/.oh-my-zsh"
 # load a random theme each time oh-my-zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
 # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
-ZSH_THEME="minimal"
+ZSH_THEME="lambda"
 # Good themes:
 # afowler
 # bira