diff --git a/nvim/init.vim b/nvim/init.vim
index 7488258..335d231 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -1,18 +1,12 @@
 source $HOME/dotfiles/nvim/plugins.vim
 source $HOME/dotfiles/nvim/general.vim
 source $HOME/dotfiles/nvim/remaps.vim
+source $HOME/dotfiles/nvim/theme.vim
+source $HOME/dotfiles/nvim/terminal.vim
 source $HOME/dotfiles/nvim/file-tree.vim
 source $HOME/dotfiles/nvim/coc.vim
 source $HOME/dotfiles/nvim/tabs.vim
 
-" Colorscheme
-let ayucolor = 'mirage'
-colorscheme ayu
-
-" Airline
-let g:airline#extensions#tabline#enabled = 1
-let g:airline_theme = 'ayu_mirage'
-
 " Filetypes for markdown extension
 let g:mkdp_filetypes = ['md', 'mdx', 'markdown']
 
diff --git a/nvim/terminal.vim b/nvim/terminal.vim
new file mode 100644
index 0000000..574f4b4
--- /dev/null
+++ b/nvim/terminal.vim
@@ -0,0 +1,2 @@
+" Use Escape to go to normal mode
+tnoremap <Esc> <C-\><C-n>
diff --git a/nvim/theme.vim b/nvim/theme.vim
new file mode 100644
index 0000000..1e887b0
--- /dev/null
+++ b/nvim/theme.vim
@@ -0,0 +1,7 @@
+" Colorscheme
+let ayucolor = 'mirage'
+colorscheme ayu
+
+" Airline
+let g:airline#extensions#tabline#enabled = 1
+let g:airline_theme = 'ayu_mirage'