diff --git a/base-linux/.config/zsh/zshrc.d/base-linux.zsh b/base-linux/.config/zsh/zshrc.d/base-linux.zsh
new file mode 100644
index 0000000..68f1247
--- /dev/null
+++ b/base-linux/.config/zsh/zshrc.d/base-linux.zsh
@@ -0,0 +1 @@
+eval "$(dircolors -b)"
diff --git a/base/.config/zsh/zshrc.d/base.sh b/base/.config/zsh/zshrc.d/base.sh
deleted file mode 100644
index 2015f76..0000000
--- a/base/.config/zsh/zshrc.d/base.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-setopt autocd
-setopt autopushd
-setopt pushdignoredups
diff --git a/base/.config/zsh/zshrc.d/base.zsh b/base/.config/zsh/zshrc.d/base.zsh
new file mode 100644
index 0000000..78b451b
--- /dev/null
+++ b/base/.config/zsh/zshrc.d/base.zsh
@@ -0,0 +1,25 @@
+setopt autocd
+setopt autopushd
+setopt pushdignoredups
+setopt histignorealldups
+setopt sharehistory
+
+# Use emacs keybindings even if our EDITOR is set to vi
+bindkey -e
+
+zstyle ':completion:*' auto-description 'specify: %d'
+zstyle ':completion:*' completer _expand _complete _correct _approximate
+zstyle ':completion:*' format 'Completing %d'
+zstyle ':completion:*' group-name ''
+zstyle ':completion:*' menu select=2
+zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
+zstyle ':completion:*' list-colors ''
+zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
+zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=* l:|=*'
+zstyle ':completion:*' menu select=long
+zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s
+zstyle ':completion:*' use-compctl false
+zstyle ':completion:*' verbose true
+
+zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;31'
+zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd'
diff --git a/base/.zshrc b/base/.zshrc
index d43eda2..7f5f679 100644
--- a/base/.zshrc
+++ b/base/.zshrc
@@ -10,7 +10,7 @@ if [[ -d "${XDG_CONFIG_HOME}/zsh/env.d" ]]; then
 fi
 
 if [ -d "${XDG_CONFIG_HOME}/zsh/zshrc.d" ]; then
-    for file in "${XDG_CONFIG_HOME}"/zsh/zshrc.d/*.sh(N); do
+    for file in "${XDG_CONFIG_HOME}"/zsh/zshrc.d/*.zsh(N); do
         if [ -r "$file" ]; then
             #shellcheck disable=1090
             . "$file"