diff --git a/.gitignore b/.gitignore
index 084e3da..aa5b9cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -263,3 +263,4 @@ pdfarranger/
 abiword/
 kalk/
 netsurf/
+nvm/
diff --git a/shell/bashrc b/shell/bashrc
index 7128979..c165370 100644
--- a/shell/bashrc
+++ b/shell/bashrc
@@ -56,3 +56,7 @@ fi
 if [ -f ~/.config/shell/gui.sh ] ; then
     . ~/.config/shell/gui.sh
 fi
+
+if [ -s "$NVM_DIR/bash_completion" ] ; then
+    . "$NVM_DIR/bash_completion"
+fi
diff --git a/shell/profile.d/android.sh b/shell/profile.d/android.sh
new file mode 100644
index 0000000..f945406
--- /dev/null
+++ b/shell/profile.d/android.sh
@@ -0,0 +1,8 @@
+if [ -f "$XDG_DATA_HOME" ] ; then
+    export ANDROID_HOME=$XDG_DATA_HOME/Android/Sdk
+else
+    export ANDROID_HOME=$HOME/Android/Sdk
+fi
+
+export PATH=$PATH:$ANDROID_HOME/emulator
+export PATH=$PATH:$ANDROID_HOME/platform-tools
diff --git a/shell/profile.d/nvm.sh b/shell/profile.d/nvm.sh
new file mode 100644
index 0000000..c2cdc9c
--- /dev/null
+++ b/shell/profile.d/nvm.sh
@@ -0,0 +1,5 @@
+export NVM_DIR="$HOME/.config/nvm"
+
+if [ -s "$NVM_DIR/nvm.sh" ] ; then
+    . "$NVM_DIR/nvm.sh"
+fi
diff --git a/sway/config b/sway/config
index 8cbcd03..44a2e0c 100644
--- a/sway/config
+++ b/sway/config
@@ -102,7 +102,7 @@ bindsym $mod+Shift+5 move container to workspace "  5  "
 bindsym $mod+comma workspace next_on_output
 bindsym $mod+period workspace prev_on_output
 # -
-bindsym $mod+Shift+t layout tabbed
+bindsym $mod+Shift+t layout toggle tabbed split
 bindsym $mod+f fullscreen
 bindsym $mod+Shift+f floating toggle
 # -