diff --git a/.bashrc b/.bashrc
index ad8f1c1..6d5541f 120000
--- a/.bashrc
+++ b/.bashrc
@@ -1 +1 @@
-.config/shell/shellrc
\ No newline at end of file
+.config/bash/bashrc
\ No newline at end of file
diff --git a/.config/bash/bashrc b/.config/bash/bashrc
new file mode 100644
index 0000000..8fb91c2
--- /dev/null
+++ b/.config/bash/bashrc
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+shopt -s autocd
+set -o vi
+stty -ixon # Disable ctrl-s and ctrl-q.
+HISTSIZE=10000
+SAVEHIST=10000
+HISTFILE=~/.cache/shhistory
+
+[ -f "$HOME/.config/shortcutrc" ] && source "$HOME/.config/shortcutrc" # Load shortcut aliases
+[ -f "$HOME/.config/aliasrc" ] && source "$HOME/.config/aliasrc" # Load aliases
+
+pfetch && echo $(vrms) | grep "non-free"
diff --git a/.config/zsh/zshrc b/.config/zsh/zshrc
new file mode 100644
index 0000000..f41c340
--- /dev/null
+++ b/.config/zsh/zshrc
@@ -0,0 +1,10 @@
+set -o vi
+stty -ixon # Disable ctrl-s and ctrl-q.
+HISTSIZE=10000
+SAVEHIST=10000
+HISTFILE=~/.cache/shhistory
+
+[ -f "$HOME/.config/shortcutrc" ] && source "$HOME/.config/shortcutrc" # Load shortcut aliases
+[ -f "$HOME/.config/aliasrc" ] && source "$HOME/.config/aliasrc" # Load aliases
+
+pfetch && echo $(vrms) | grep "non-free"
diff --git a/.zshrc b/.zshrc
index ad8f1c1..7fd83ee 120000
--- a/.zshrc
+++ b/.zshrc
@@ -1 +1 @@
-.config/shell/shellrc
\ No newline at end of file
+.config/zsh/zshrc
\ No newline at end of file