diff --git a/makefile b/makefile
new file mode 100644
index 0000000..9ff3dd7
--- /dev/null
+++ b/makefile
@@ -0,0 +1,55 @@
+# Makefile for Niblock Dotfiles
+
+.PHONY: help \
+     link-dotfiles \
+     build-default \
+     build-simple \
+     install-vim-config \
+     install-vim-plugin \
+     install-git \
+     install-tmux \
+     install-bash-config \
+     install-bash-profile \
+     install-irssi
+
+.DEFAULT-GOAL := help
+
+help:			## Display this menu
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | \
+        awk 'BEGIN {FS = ":.*?## "}; {printf "%-25s %s\n", $$1, $$2}'
+
+link-dotfiles:		## Create dotfiles link in Home directory
+	ln -s -- "$(CURDIR)" "$(HOME)"/.dotfiles/
+
+build-default:		## Create default environment, using all dotfiles
+build-default: link-dotfiles \
+     install-vim-config \
+     install-vim-plugin \
+     install-git \
+     install-tmux \
+     install-bash-config \
+     install-bash-profile \
+     install-irssi
+
+build-simple:		## Create minimal environment, for remote or single-use
+build-simple: install-vim-config \
+     install-bash-profile
+
+install-vim-config:	## Create vimrc file in Home directory
+	ln -s -- "$(CURDIR)"/vim/vimrc "$(HOME)"/.vimrc
+
+install-vim-plugin:	## Create vimrc-plugins (Plugin file) in Home directory
+	ln -s -- "$(CURDIR)"/vim/vimrc-plugins "$(HOME)"/.vimrc-plugins
+
+install-git:		## Create git config and ignore files in Home directory
+	ln -s -- "$(CURDIR)"/git/gitconfig "$(HOME)"/.gitconfig
+	ln -s -- "$(CURDIR)"/git/gitignore "$(HOME)"/.gitignore
+
+install-tmux:		## Create tmux config file in Home directory
+	ln -s -- "$(CURDIR)"/tmux/tmux.config "$(HOME)"/.tmux.config
+
+install-bash-config:	## Create bash config file in Home directory
+
+install-bash-profile:	## Cretae bash profile file in Home directory
+
+install-irssi:		## Create irssi directory and file in Home directory
diff --git a/vim/vimrc b/vim/vimrc
index 1ea0976..c74df93 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -37,7 +37,7 @@ set softtabstop=5
 " Set width; word wrap; scroll mods
 set scrolloff=5
 set tw=80
-set colorcolumn=80
+" set colorcolumn=80
 set wrap
 
 " Enable auto-completion for vim commands
@@ -61,9 +61,9 @@ colorscheme desert
 "    runtime bundle/vim-pathogen/autoload/pathogen.vim
 "    execute pathogen#infect()
 
-" New Way: Vim-Plug, add-ons configured in .vimrc.bundles
-     if filereadable(expand("~/.vimrc.bundles"))
-          source ~/.vimrc.bundles
+" New Way: Vim-Plug, add-ons configured in .vimrc-plugins
+     if filereadable(expand("~/.vimrc-plugins"))
+          source ~/.vimrc-plugins
      endif
 
 "######
@@ -91,7 +91,7 @@ nnoremap <silent> <leader>h :set nohlsearch!<CR>
 " Edit dotfiles with <leader>d
 "  v is for vim
      nnoremap <silent> <leader>dv :tabnew ~/.dotfiles/vim/vimrc<CR>
-     nnoremap <silent> <leader>dp :tabnew ~/.dotfiles/vim/vimrc.bundles<CR>
+     nnoremap <silent> <leader>dp :tabnew ~/.dotfiles/vim/vimrc-plugins<CR>
 "  b is for bash
 "    nnoremap <silent> <leader>db :tabnew ~/.dotfiles/bash/bashrc<CR>
 "  t is for tmux
diff --git a/vim/vimrc.bundles b/vim/vimrc-plugins
similarity index 100%
rename from vim/vimrc.bundles
rename to vim/vimrc-plugins