diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 0fd5677..6de7dc5 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -2,8 +2,9 @@ import:
   - ~/.config/alacritty/schemes.yml
 
 env:
-  TERM: xterm-256color
+  TERM: alacritty
 font:
+  scale_with_dpi: true
   # The size to use.
   size: 12
   # The normal (roman) font face to use.
diff --git a/nvim/init.vim b/nvim/init.vim
index e84787e..09d2184 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -81,8 +81,7 @@ filetype plugin indent on
 set cinkeys-=0#
 
 " Terminal emulator settings
-set t_Co=256
-"set term=screen-256color
+set termguicolors
 
 " Color configuration
 try
@@ -90,6 +89,7 @@ try
 catch
     " Ignore non existing file
 endtry
+highlight Comment cterm=italic gui=italic
 syntax enable	" enable syntax processing
 
 " Disable annoying bell
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 0186664..9f84b62 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -1,5 +1,5 @@
 set-environment -g PATH "/usr/local/bin:/bin:/usr/bin"
-set -g default-terminal "xterm-256color"
+set -g default-terminal "alacritty"
 
 set -g history-limit 20000