diff --git a/.bash_android b/.bash_android
index 56d1a67..6c9bb0f 100644
--- a/.bash_android
+++ b/.bash_android
@@ -1,13 +1,15 @@
 #
 # set the path to android executables
 #
+ANDROID_SDK_HOME='/usr/local/opt/android-sdk'
+ANDROID_NDK='/usr/local/opt/android-sdk/ndk-bundle'
+ANDROID_AVD_HOME=~   #/Users/j3g
+ANT_HOME=' /usr/local/Cellar/ant'
+JUNIT_HOME='/usr/local/lib/junit'
+BUILD_TOOLS_VER='23.0.3'
 
-ANDROID_SDK_HOME='/Applications/android-dev/android-sdk'
-ANDROID_NDK='/Applications/android-dev/android-ndk'
-ANT_HOME=' /usr/local/Cellar/ant_'
-
-# ln -s /Library/Java/JavaVirtualMachines/1.7.0.jdk/Contents/Home /usr/local/bin/javahome
-JAVA_HOME='/usr/local/bin/javahome'
+# sudo ln -s /Library/Java/JavaVirtualMachines/jdk1.8.0_77.jdk/Contents/Home /Library/Java/JavaVirtualMachines/current
+JAVA_HOME='/Library/Java/JavaVirtualMachines/current'
 
 # path to binaries
 export JAVA_BIN=$JAVA_HOME/bin
@@ -21,11 +23,12 @@ export ANDROID_SDK_HOME=$ANDROID_SDK_HOME
 export ANDROID_HOME=$ANDROID_SDK_HOME
 
 # set path to android tool binaries
-export PATH=$ANDROID_SDK_HOME/build-tools/android-4.4.2:$PATH
+export PATH=$ANDROID_SDK_HOME/build-tools/$BUILD_TOOLS_VER:$PATH
 export PATH=$ANDROID_SDK_HOME/platform-tools:$PATH
 export PATH=$ANDROID_SDK_HOME/tools:$PATH
 
 # ndk tools
+export PATH=$ANDROID_NDK:$PATH
 export PATH=$ANDROID_NDK/build/tools:$PATH
 
 ### ### ###
diff --git a/.bash_crypto b/.bash_crypto
index c54941e..3fa56bd 100644
--- a/.bash_crypto
+++ b/.bash_crypto
@@ -1,6 +1,6 @@
 # brew openssl
 # openssl_ -> /usr/local/Cellar/openssl/1.0.2e_1/bin/openssl
-export OSSL=/usr/local/Cellar/openssl_
+export OSSL=/usr/local/Cellar/openssl/openssl
 
 #openssl
 alias ossl=$OSSL
diff --git a/.bash_servers b/.bash_servers
index 4c8ca21..e031782 100644
--- a/.bash_servers
+++ b/.bash_servers
@@ -1,2 +1,5 @@
 # ssh servers
-alias malloc='ssh j3g@dev.malloc.io -D 7891'
+alias malloc='ssh j3g@dev.malloc.io -p 1100 -D 7891'
+
+# mosh
+alias mosh.m='mosh dev.malloc.io --ssh="ssh -p 1100"'
diff --git a/settings/Solarized Dark.terminal b/settings/Solarized Dark.terminal
old mode 100755
new mode 100644
diff --git a/settings/Solarized Light.terminal b/settings/Solarized Light.terminal
old mode 100755
new mode 100644
diff --git a/settings/README.md b/settings/Solarized_README.md
old mode 100755
new mode 100644
similarity index 100%
rename from settings/README.md
rename to settings/Solarized_README.md
diff --git a/settings/hamcrest-core-1.3.jar b/settings/hamcrest-core-1.3.jar
new file mode 100644
index 0000000..9d5fe16
Binary files /dev/null and b/settings/hamcrest-core-1.3.jar differ
diff --git a/settings/junit-4.12.jar b/settings/junit-4.12.jar
new file mode 100644
index 0000000..3a7fc26
Binary files /dev/null and b/settings/junit-4.12.jar differ