diff --git a/.config/sway/arch-lappy-sway b/.config/sway/arch-lappy-sway
index 47015fa..3fef76e 100644
--- a/.config/sway/arch-lappy-sway
+++ b/.config/sway/arch-lappy-sway
@@ -11,7 +11,7 @@ bindsym $mod+F7 exec --no-startup-id xset r rate 250 25 && xset b off && setxkbm
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec --no-startup-id termite
+bindsym $mod+Return exec --no-startup-id alacritty
 
 # kill focused window
 bindsym $mod+q kill
@@ -122,7 +122,7 @@ bindsym $mod+Shift+0 move container to workspace number 10
 ########################
 ## Custom Keybindings
 ########################
-bindsym $mod+f exec --no-startup-id termite -e ranger
+bindsym $mod+f exec --no-startup-id alacrity -e ranger
 bindsym Print exec scrot -s -e 'mv $f ~/Downloads'
 bindsym $mod+m move scratchpad
 bindsym $mod+n scratchpad show
diff --git a/.profile b/.profile
index f741964..5163490 100644
--- a/.profile
+++ b/.profile
@@ -12,13 +12,12 @@ alias cp='cp -iv' # prompt when overwriting and verbose
 alias mv='mv -iv' # prompt when overwriting and verbose
 alias ll='ls -FGlAhp'
 alias du1='du -h -d 1'
-alias loopbackftw='sudo ip addr add 192.168.237.237/24 brd + dev wlp4s0 label wlp4s0:1'
-alias loopbackftwethernet='sudo ip addr add 192.168.237.237/24 brd + dev enp0s31f6 label enp0s31f6:1'
+alias ls='exa'
 # channeling Justin & alisiasing my git
-alias gs='g status'
-alias ga='g add'
-alias gc='g commit'
-alias gcm='g commit -m'
+alias gs='git status'
+alias gap='git add -p'
+#alias gc='g commit'
+#alias gcm='g commit -m'
 alias please='sudo !!'
 
 # networking
@@ -87,9 +86,11 @@ alias dmenu="dmenu -b -fn '-*-helvetica-medium-r-normal-*-17-*-*-*-*-*-*-*' -nf
 
 # my path
 export PATH="/usr/local/bin/php:/usr/local/bin:/usr/local/sbin:/opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/git/bin:$PATH"
+export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
 
-export NVM_DIR="/home/joshfabean/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
+npm set prfix ~/.npm
+PATH="$HOME/.npm/bin:$PATH"
+PATH="./node_modules/.bin:$PATH"
 
 #export ANDROID_HOME="/usr/local/opt/android-sdk"
 export ANDROID_HOME="/home/joshfabean/Android/Sdk"
@@ -98,6 +99,8 @@ export PATH=$PATH:$ANDROID_HOME/platform-tools
 export PATH=$PATH:$HOME/Code/pantheon-tools
 export PATH=$PATH:$HOME/Code/vendor/bin
 export PATH=$PATH:$HOME/.config/composer/vendor/bin
-export PATH=$PATH:$HOME/.nvm
-
 export LIBVA_DRIVER_NAME=vdpau
+export EDITOR=nvim
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
+export LC_ALL="en_US.UTF-8"
+
diff --git a/.zshrc b/.zshrc
index f563605..c4eecb8 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,13 +1,4 @@
-# If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
-
-# Path to your oh-my-zsh installation.
-  export ZSH=/home/joshfabean/.oh-my-zsh
-
-# Set name of the theme to load. Optionally, if you set this to "random"
-# it'll load a random theme each time that oh-my-zsh is loaded.
-# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
-ZSH_THEME="robbyrussell"
+#ZSH_THEME="robbyrussell"
 
 # Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
@@ -51,9 +42,8 @@ ZSH_THEME="robbyrussell"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git)
+#plugins=(git)
 
-source $ZSH/oh-my-zsh.sh
 source ~/.profile
 # User configuration
 
@@ -84,9 +74,6 @@ source ~/.profile
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 #
-export NVM_DIR="$HOME/.nvm"
-  [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
 export EDITOR=nvim