diff --git a/bash/bash_tmux.sh b/bash/bash_tmux.sh
index 45ef23d..428e38f 100644
--- a/bash/bash_tmux.sh
+++ b/bash/bash_tmux.sh
@@ -17,7 +17,7 @@ function tmux_init() {
 
 function go_tmux ()
 {
-  if [[ "$TERM" == screen* ]]; then
+  if [[ "$TERM" == screen* ]] || "$TERM" == tmux* ]]; then
     echo "You're already inside a tmux instance!"
     return 1;
   fi
diff --git a/nvim/init.vim b/nvim/init.vim
index 0178085..24190b4 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -1,4 +1,5 @@
 set runtimepath^=~/.vim runtimepath+=~/.vim/after
+set termguicolors " True Color support
 let &packpath = &runtimepath
 source ~/.vimrc
 map <Leader>n <plug>NERDTreeTabsToggle<CR>
diff --git a/set-git-urls.sh b/set-git-urls.sh
new file mode 100755
index 0000000..aeddcf5
--- /dev/null
+++ b/set-git-urls.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+cd ${__COMMON_CONFIGS}
+git remote set-url origin https://git.reya.zone/reya/common-configs.git
+git remote set-url --push origin ssh://git@git.reya.zone/reya/common-configs.git
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 050ad4e..5e65384 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -15,8 +15,10 @@ bind % split-window -h -c "#{pane_current_path}"
 # Terminal Properties
 #####################
 set-option -g default-shell /bin/zsh
-set-option -sa terminal-overrides ',xterm:RGB'
-set-option -g default-terminal screen-256color-bce
+set-option -sga terminal-overrides ',xterm*:Tc'
+set-option -sga terminal-overrides ',screen*:Tc'
+set-option -sga terminal-overrides ',tmux*:Tc'
+set-option -g default-terminal tmux-256color
 set-option -sg escape-time 10
 
 ############################
diff --git a/vim/vimrc b/vim/vimrc
index a8f01e8..5dc1b4d 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -36,6 +36,7 @@ syntax on
 "hi ALEWarning ctermbg=106 ctermfg=Black
 
 let g:airline#extensions#tabline#enabled = 1
+let g:airline_powerline_fonts = 1
 set modeline
 set expandtab
 set shiftwidth=2
diff --git a/zsh/customizations/zsh_tmux.zsh b/zsh/customizations/zsh_tmux.zsh
index efc4961..abc9f25 100644
--- a/zsh/customizations/zsh_tmux.zsh
+++ b/zsh/customizations/zsh_tmux.zsh
@@ -11,7 +11,7 @@ function tmux_init() {
 }
 
 function go_tmux() {
-  if [[ "$TERM" == screen* ]]; then
+  if [[ "$TERM" == screen* ]] || [[ "$TERM" == tmux* ]]; then
     >&2 echo "You're already inside a tmux instance!"
     return 1
   fi