diff --git a/configure-system b/configure-system
index ad025c6..352a9fd 100755
--- a/configure-system
+++ b/configure-system
@@ -29,6 +29,42 @@ if command -v fish &> /dev/null; then
     esac
 fi
 
+# set shell to zsh
+if command -v zsh &> /dev/null; then
+    read -r -p "You have the fish shell installed, would you like to set this as your default shell? [Y/n] " input
+    case $input in
+    [nN][oO] | [nN])
+        echo "Okay, not setting shell."
+        ;;
+    *)
+        echo "Okay, setting shell to zsh."
+        chsh -s `which zsh`
+        ;;
+    esac
+
+    read -r -p "Would you also like to install oh-my-zsh? [Y/n]" input
+    case $input in
+    [nN][oO] | [nN])
+        echo "Okay, not installing."
+        ;;
+    *)
+        echo "Installing oh-my-zsh."
+        sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+        ;;
+    esac
+
+    read -r -p "Would you also like to install my zsh theme? (depends on oh-my-zsh) [Y/n]" input
+    case $input in
+    [nN][oO] | [nN])
+        echo "Okay, not installing."
+        ;;
+    *)
+        echo "Installing theme."
+        ln .config/zsh/themes/inkletblotsh.zsh-theme .oh-my-zsh/custom/themes/inkletblotsh.zsh-theme
+        ;;
+    esac
+fi
+
 # make a very rudimentary attempt to configure lightdm
 if command -v lightdm &> /dev/null; then
     echo "You have lightdm installed, I'm assuming you also have my chosen theme lightdm-webkit-theme-litarvan installed as well."
diff --git a/default-programs b/default-programs
index b8c272c..4f38748 100644
--- a/default-programs
+++ b/default-programs
@@ -59,7 +59,7 @@ DEPENDENCIES_LAPTOP_END
 DEFAULTS_START
 evince
 firefox
-fish
+zsh
 alacritty
 thunar
 newsboat
@@ -96,6 +96,7 @@ colorpicker-ym1234-git
 ansible
 android-sdk-platform-tools
 runelite
+fish
 slack-desktop
 barrier
 todoist-electron