diff --git a/justfile b/justfile
index 70d4bc9..4a57d74 100644
--- a/justfile
+++ b/justfile
@@ -44,7 +44,11 @@ setup-mpv:
 # Set ZSH as default shell and install plugins
 setup-shell:
   chsh -s /usr/bin/zsh
-  sheldon lock
+  curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh | sh
+  git clone https://github.com/hlissner/zsh-autopair ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autopair
+  git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
+  git clone https://github.com/zsh-users/zsh-history-substring-search ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-history-substring-search
+  git clone https://github.com/zsh-users/zsh-syntax-highlighting ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
 
 # Installs Waydroid with GAPPS
 setup-waydroid:
diff --git a/zsh/.config/sheldon/plugins.toml b/zsh/.config/sheldon/plugins.toml
deleted file mode 100644
index 2256572..0000000
--- a/zsh/.config/sheldon/plugins.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-[plugins.autopair]
-github = "hlissner/zsh-autopair"
-
-[plugins.zsh-autosuggestions]
-github = "zsh-users/zsh-autosuggestions"
-use = ["{{ name }}.zsh"]
-
-[plugins.zsh-syntax-highlighting]
-github = "zsh-users/zsh-syntax-highlighting"
diff --git a/zsh/.config/starship.toml b/zsh/.config/starship.toml
deleted file mode 100644
index eb275f7..0000000
--- a/zsh/.config/starship.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Get editor completions based on the config schema
-"$schema" = 'https://starship.rs/config-schema.json'
-
-add_newline = false
-
-format = '''
-$hostname$directory$git_branch$git_status$character
-'''
-
-[git_branch]
-format = "[$branch(:$remote_branch)]($style) "
-style = "black"
-
-[git_status]
-format = "([$all_status$ahead_behind]($style) )"
-deleted = "X"
-style = "bold white"
-
-[hostname]
-ssh_only = false
-format = "[$ssh_symbol$hostname]($style) "
-style = "bold purple"
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 367d624..4b3460c 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -1 +1,2 @@
+export MANGOHUD=1
 export RANGER_LOAD_DEFAULT_RC=FALSE
diff --git a/zsh/.zshrc b/zsh/.zshrc
index c71f30a..94b8645 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,15 +1,79 @@
-autoload -Uz compinit
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
 
-# Auto completion
-compinit
-zstyle ':completion:*' menu select
-zstyle ':completion::complete:*' gain-privileges 1
+# Path to your oh-my-zsh installation.
+export ZSH="$HOME/.oh-my-zsh"
 
-# Aliases
+# Set name of the theme to load --- if set to "random", it will
+# load a random theme each time oh-my-zsh is loaded, in which case,
+# to know which specific one was loaded, run: echo $RANDOM_THEME
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
+ZSH_THEME="gallifrey"
+
+# Set list of themes to pick from when loading at random
+# Setting this variable when ZSH_THEME=random will cause zsh to load
+# a theme from this variable instead of looking in $ZSH/themes/
+# If set to an empty array, this variable will have no effect.
+# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion.
+# Case-sensitive completion must be off. _ and - will be interchangeable.
+HYPHEN_INSENSITIVE="true"
+
+# Uncomment one of the following lines to change the auto-update behavior
+# zstyle ':omz:update' mode disabled  # disable automatic updates
+# zstyle ':omz:update' mode auto      # update automatically without asking
+# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
+
+# Uncomment the following line to change how often to auto-update (in days).
+# zstyle ':omz:update' frequency 13
+
+# Uncomment the following line if pasting URLs and other text is messed up.
+# DISABLE_MAGIC_FUNCTIONS="true"
+
+# Uncomment the following line to disable colors in ls.
+DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# You can also set it to another string to have that shown instead of the default red dots.
+# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
+# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load?
+# Standard plugins can be found in $ZSH/plugins/
+# Custom plugins may be added to $ZSH_CUSTOM/plugins/
+plugins=(colored-man-pages git python zsh-autopair zsh-autosuggestions zsh-history-substring-search zsh-syntax-highlighting)
+
+export PYTHON_AUTO_VRUN=true
+export PYTHON_VENV_NAME=".venv"
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
 alias ls=eza
-
-# Plugins
-eval "$(sheldon source)"
-
-# Prompt
-eval "$(starship init zsh)" # THIS MUST BE THE LAST LINE