diff --git a/.gitconfig b/.gitconfig
index f2bdfbe..39810b4 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,8 +3,12 @@
         email = mr.eduardo.figueroa@gmail.com
 
 [alias]
-lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
-lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
-lg = !"git lg1"
+        lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
+        lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
+        lg = !"git lg1"
 [core]
         excludesfiles = .gitignore
+[pull]
+        rebase = true
+[init]
+        defaultBranch = main
\ No newline at end of file
diff --git a/utils/lesshst b/.lesshst
similarity index 100%
rename from utils/lesshst
rename to .lesshst
diff --git a/.vimrc b/.vimrc
index f9fd00e..c6d1baa 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1 +1,43 @@
-set tabstop=8 softtabstop=0 expandtab shiftwidth=4 smarttab
+syntax on               " enable syntax highlighting
+set cursorline          " highlight the current line
+set background=dark   " darker color scheme
+set ruler             " show line number in bar
+set nobackup            " don't create pointless backup files; Use VCS instead
+set autoread            " watch for file changes
+set number              " show line numbers
+set showcmd             " show selection metadata
+set showmode            " show INSERT, VISUAL, etc. mode
+set showmatch           " show matching brackets
+set autoindent smartindent  " auto/smart indent
+set smarttab            " better backspace and tab functionality
+set scrolloff=5         " show at least 5 lines above/below
+filetype on             " enable filetype detection
+filetype indent on      " enable filetype-specific indenting
+filetype plugin on      " enable filetype-specific plugins
+" colorscheme cobalt      " requires cobalt.vim to be in ~/.vim/colors
+
+" column-width visual indication
+let &colorcolumn=join(range(81,999),",")
+highlight ColorColumn ctermbg=235 guibg=#001D2F
+
+" tabs and indenting
+set autoindent          " auto indenting
+set smartindent         " smart indenting
+set expandtab           " spaces instead of tabs
+set tabstop=2           " 2 spaces for tabs
+set shiftwidth=2        " 2 spaces for indentation
+
+" bells
+set noerrorbells        " turn off audio bell
+set visualbell          " but leave on a visual bell
+
+" search
+set hlsearch            " highlighted search results
+set showmatch           " show matching bracket
+
+" other
+set guioptions=aAace    " don't show scrollbar in MacVim
+" call pathogen#infect()  " use pathogen
+
+" clipboard
+set clipboard=unnamed   " allow yy, etc. to interact with OS X clipboard
\ No newline at end of file
diff --git a/shells/zshrc b/.zshrc
similarity index 100%
rename from shells/zshrc
rename to .zshrc
diff --git a/bootstrap.sh b/bootstrap.sh
deleted file mode 100755
index b96a58c..0000000
--- a/bootstrap.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-#move to home directory
-
-SHELLS=./shells/*
-UTILS=./utils/*
-GIT=./git/*
-
-for file in $SHELLS
-do  
-    newFile=$(echo "file name " ${file:2} | cut -d'/' -f 2)
-    cp -v $file $HOME$newFile
-done
-
-for file in $UTILS
-do  
-    newFile=$(echo "file name " ${file:2} | cut -d'/' -f 2)
-    cp -v $file $HOME$newFile
-done
-
-
-for file in $GIT
-do  
-    newFile=$(echo "file name " ${file:2} | cut -d'/' -f 2)
-    cp -v $file $HOME$newFile
-done
-
-echo "Files moved to home directory, enjoy your workflow."
-
-
-
diff --git a/git/gitconfig b/git/gitconfig
deleted file mode 100644
index f2bdfbe..0000000
--- a/git/gitconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-[user]
-        name = Eduardo Figueroa
-        email = mr.eduardo.figueroa@gmail.com
-
-[alias]
-lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
-lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
-lg = !"git lg1"
-[core]
-        excludesfiles = .gitignore
diff --git a/git/gitignore b/git/gitignore
deleted file mode 100644
index 6775e39..0000000
--- a/git/gitignore
+++ /dev/null
@@ -1,40 +0,0 @@
-# Compiled source #
-###################
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
-*.pyc
-
-# Packages #
-############
-# it's better to unpack these files and commit the raw source
-# git has its own built in compression methods
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-
-# Logs and databases #
-######################
-*.log
-*.sql
-*.sqlite
-logfile
-test
-
-# OS generated files #
-######################
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-Thumbs.db
diff --git a/shells/bash_aliases b/shells/bash_aliases
deleted file mode 100644
index 3e80b12..0000000
--- a/shells/bash_aliases
+++ /dev/null
@@ -1 +0,0 @@
-alias noc="grep -e -v '#|^$' "
diff --git a/shells/bashrc b/shells/bashrc
deleted file mode 100644
index 221451e..0000000
--- a/shells/bashrc
+++ /dev/null
@@ -1,135 +0,0 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
-# If not running interactively, don't do anything
-case $- in
-    *i*) ;;
-      *) return;;
-esac
-
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# If set, the pattern "**" used in a pathname expansion context will
-# match all files and zero or more directories and subdirectories.
-#shopt -s globstar
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-    xterm-color|*-256color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	# We have color support; assume it's compliant with Ecma-48
-	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	# a case would tend to support setf rather than setaf.)
-	color_prompt=yes
-    else
-	color_prompt=
-    fi
-fi
-
-if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
-    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
-    ;;
-*)
-    ;;
-esac
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
-    alias grep='grep --color=auto'
-    alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto'
-fi
-
-# colored GCC warnings and errors
-#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-
-# some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-
-# Add an "alert" alias for long running commands.  Use like so:
-#   sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if ! shopt -oq posix; then
-  if [ -f /usr/share/bash-completion/bash_completion ]; then
-    . /usr/share/bash-completion/bash_completion
-  elif [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
-  fi
-fi
-
-
-man() {
-	env \
-		LESS_TERMCAP_md=$'\e[1;36m' \
-		LESS_TERMCAP_me=$'\e[0m' \
-		LESS_TERMCAP_se=$'\e[0m' \
-		LESS_TERMCAP_so=$'\e[1;40;92m' \
-		LESS_TERMCAP_ue=$'\e[0m' \
-		LESS_TERMCAP_us=$'\e[1;32m' \
-			man "$@"
-}
-
-
-export PS1="\[\033[38;5;33m\]\u\[$(tput sgr0)\]\[\033[38;5;15m\]@\h:\[$(tput sgr0)\]\[\033[38;5;6m\][\w]:\[$(tput sgr0)\]\[\033[38;5;15m\] \[$(tput sgr0)\]"
-alias noc='egrep -v "#|^$"'
-
-
diff --git a/utils/tmux.conf b/utils/tmux.conf
deleted file mode 100644
index c1cd0d3..0000000
--- a/utils/tmux.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-#change binding from ctrl+b to screen-like ctrl+a
-set-option -g prefix C-a
-
-#copy screen last window method
-bind-key C-a last-window
-
-#start windows numbers at 1
-set -g base-index 1
-
-#enable mouse scrolling in terminal history
-set -g mouse on
-
-set -g utf8 on
-set -g status-utf8 on
-
-set -g history-limit 50000
-set -g display-time 4000
-
-set -g status-interval 5
-
-set -g default-terminal "screen-256color"
-
-set -g focus-events on
-
-setw -g aggressive-resize on
-
-#vim copy/paste bindings
-bind P paste-buffer
-bind-key -t vi-copy 'v' begin-selection
-bind-key -t vi-copy 'y' copy-selection
-bind-key -t vi-copy 'r' rectangle-toggle
diff --git a/utils/vimrc b/utils/vimrc
deleted file mode 100644
index f9fd00e..0000000
--- a/utils/vimrc
+++ /dev/null
@@ -1 +0,0 @@
-set tabstop=8 softtabstop=0 expandtab shiftwidth=4 smarttab