diff --git a/base-osx/.config/bash/bashrc.d/base-osx.sh b/base-osx/.config/bash/bashrc.d/base-osx.sh
new file mode 100644
index 0000000..ce07973
--- /dev/null
+++ b/base-osx/.config/bash/bashrc.d/base-osx.sh
@@ -0,0 +1,3 @@
+#ft=bash
+
+alias ls='ls -G'
diff --git a/user-dirs-osx/.config/user-dirs.dirs b/base-osx/.config/user-dirs.dirs
similarity index 100%
rename from user-dirs-osx/.config/user-dirs.dirs
rename to base-osx/.config/user-dirs.dirs
diff --git a/user-dirs-osx/.config/user-dirs.locale b/base-osx/.config/user-dirs.locale
similarity index 100%
rename from user-dirs-osx/.config/user-dirs.locale
rename to base-osx/.config/user-dirs.locale
diff --git a/bash/.bashrc b/bash/.bashrc
index 9e0dc01..d0f61dd 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # If not running interactively, don't do anything
 [ -z "$PS1" ] && return
 
diff --git a/bash/.config/bash/bashrc.d/aliases.sh b/bash/.config/bash/bashrc.d/aliases.sh
index 6152e48..b00ad8b 100644
--- a/bash/.config/bash/bashrc.d/aliases.sh
+++ b/bash/.config/bash/bashrc.d/aliases.sh
@@ -1,4 +1,4 @@
-#ft=bash
+#!/usr/bin/env bash
 alias ll='ls -alF'
 alias curl='curl --proto-default https --silent '
 
@@ -19,10 +19,6 @@ alias numfiles='find . -maxdepth 1 -type f | wc -l'
 alias slugify="sed -e 's/[^[:alnum:]]/-/g' | tr -s '-' | tr A-Z a-z"
 alias take='sudo chown $(whoami):$(whoami) '
 
-if [[ $(uname) == Darwin ]]; then
-    alias ls='ls -G'
-fi
-
 if [[ $(uname) == Linux ]]; then
     alias ls='ls --color=auto'
     alias grep='grep --color=auto'
diff --git a/bash/.config/bash/bashrc.d/bash.sh b/bash/.config/bash/bashrc.d/bash.sh
index 4b0b4f9..0b1eb32 100644
--- a/bash/.config/bash/bashrc.d/bash.sh
+++ b/bash/.config/bash/bashrc.d/bash.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #ft=bash
 
 # Disable capslock
diff --git a/bash/.config/bash/bashrc.d/completion.sh b/bash/.config/bash/bashrc.d/completion.sh
index 84b1cd3..649c01a 100644
--- a/bash/.config/bash/bashrc.d/completion.sh
+++ b/bash/.config/bash/bashrc.d/completion.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+# shellcheck disable=SC1091
 if [ -f /etc/bash_completion ]; then
     source /etc/bash_completion
 fi
diff --git a/bash/.config/bash/bashrc.d/functions.sh b/bash/.config/bash/bashrc.d/functions.sh
index 7e71774..1ac565b 100644
--- a/bash/.config/bash/bashrc.d/functions.sh
+++ b/bash/.config/bash/bashrc.d/functions.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #ft=bash
 
 function min-jpg {
diff --git a/bash/.config/bash/bashrc.d/opts.sh b/bash/.config/bash/bashrc.d/opts.sh
index 4aef955..273b733 100644
--- a/bash/.config/bash/bashrc.d/opts.sh
+++ b/bash/.config/bash/bashrc.d/opts.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 #ft=bash
 if [[ ! "${BASH_VERSION}" = "3.2*" ]]; then
     shopt -s autocd