diff --git a/README.md b/README.md
index 990dfd4..42d4f1b 100644
--- a/README.md
+++ b/README.md
@@ -30,8 +30,8 @@
 + [TeX](https://github.com/latex-lsp/texlab)
 
 ## Fonts
-+ Fira Code Regular Nerd Font Complete Mono.ttf: General
-+ IPAGothic.ttf: Japanese Characters
++ Fira Code Regular Nerd Font Complete Mono: General
++ Noto Sans CJK JP: Japanese Characters
 + [Siji](https://github.com/stark/siji): Icon Font for Polybar
 
 To get a siji icon: `clone, ./install.sh, ./view.sh, echo "\ue002"`
diff --git a/files/.config/i3/config b/files/.config/i3/config
index a750774..e0db1d2 100644
--- a/files/.config/i3/config
+++ b/files/.config/i3/config
@@ -85,6 +85,7 @@ mode "Open" {
 	bindsym c exec gsimplecal
 	bindsym d exec discord; exec Discord
 	bindsym f exec firefox
+	bindsym m exec thunderbird
 	bindsym p exec pavucontrol
 	bindsym s exec spotify
 	bindsym t exec telegram-desktop
diff --git a/files/.config/polybar/config b/files/.config/polybar/config
index 1d6b79b..51c9473 100644
--- a/files/.config/polybar/config
+++ b/files/.config/polybar/config
@@ -9,7 +9,7 @@ urgent = #e06c75
 monitor = ${env:MONITOR}
 
 font-0 = "FiraCode Nerd Font Mono:pixelsize=9;2"
-font-1 = "IPAGothic:fontformat=truetype:antialias=false:pixelsize=9;2"
+font-1 = "Noto Sans CJK JP:antialiase=false:pixelsize=9;1"
 font-2 = "Siji:size=7;1"
 font-3 = "Wuncon Siji:size=7;1"
 
diff --git a/files/.vimrc b/files/.vimrc
index 9ef2eee..795ae1c 100644
--- a/files/.vimrc
+++ b/files/.vimrc
@@ -16,7 +16,7 @@ Plug 'joshdick/onedark.vim' " Colorscheme
 
 Plug 'tpope/vim-sleuth' " Automatic intendations
 
-Plug 'jiangmiao/auto-pairs' " Pair ompletion
+Plug 'jiangmiao/auto-pairs' " Pair completion
 
 Plug 'airblade/vim-gitgutter' " Show git changes
 
diff --git a/files/.zshrc b/files/.zshrc
index a8c0a72..7a84282 100644
--- a/files/.zshrc
+++ b/files/.zshrc
@@ -150,5 +150,3 @@ bindkey '^Z' fancy-ctrl-z
 if [ -f ~/.zsh-highlighting/zsh-syntax-highlighting.zsh ]; then
     source $HOME/.zsh-highlighting/zsh-syntax-highlighting.zsh
 fi
-
-source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
diff --git a/fonts/IPAGothic.ttf b/fonts/IPAGothic.ttf
deleted file mode 100644
index 586b502..0000000
Binary files a/fonts/IPAGothic.ttf and /dev/null differ
diff --git a/fonts/NotoSansCJKjp-Regular.otf b/fonts/NotoSansCJKjp-Regular.otf
new file mode 100644
index 0000000..296fbeb
Binary files /dev/null and b/fonts/NotoSansCJKjp-Regular.otf differ