diff --git a/.zshrc.base b/.zshrc.base
new file mode 100644
index 0000000..c4c2f3c
--- /dev/null
+++ b/.zshrc.base
@@ -0,0 +1,128 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
+
+# Path to your Oh My Zsh installation.
+export ZSH="$HOME/.oh-my-zsh"
+
+# 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="jbergantine"
+ZSH_DISABLE_COMPFIX="true"
+
+
+# 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/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(
+  git
+  zsh-autosuggestions
+)
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='nvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch $(uname -m)"
+
+# Set personal aliases, overriding those provided by Oh My Zsh libs,
+# plugins, and themes. Aliases can be placed here, though Oh My Zsh
+# users are encouraged to define aliases within a top-level file in
+# the $ZSH_CUSTOM folder, with .zsh extension. Examples:
+# - $ZSH_CUSTOM/aliases.zsh
+# - $ZSH_CUSTOM/macos.zsh
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+alias la="ls -a"
+alias lah="ls -lah"
+alias treesize='sudo du -sh * | sort -rh'
+alias up='docker compose up -d'
+alias down='docker compose down'
+alias pull='docker compose pull && up'
+alias mkdir='createDir() { mkdir $1 && cd "$_" };createDir'
+alias zshrc='nano ~/.zshrc && source ~/.zshrc'
+alias token='openssl rand -hex 32'
+alias shortToken='openssl rand -hex 16'
+alias partitions='lsblk'
+alias size='sudo du -sxh .'
+alias ,,='..'
+alias restart='down && up'
+
+prompt_dir() {
+  prompt_segment blue black '%1~'
+}
diff --git a/setup_homelogic.sh b/setup_homelogic.sh
index de43519..0f877b5 100755
--- a/setup_homelogic.sh
+++ b/setup_homelogic.sh
@@ -1,16 +1,21 @@
-# Setup SSH server
-echo '### Setting up SSH ###'
-sudo systemctl enable sshd
+# Setup Server
+echo '### Setting up Server ###'
+sudo apt-get update
 sudo ufw allow 22/tcp
+sudo ufw allow 443/tcp
 sudo ufw allow 8123/tcp
 sudo ufw allow 8123/udp
 sudo ufw allow 3000/tcp
 sudo ufw allow 3001/tcp
 
-
 # Setup Docker
 echo '### Setting up Docker ###'
-sudo pacman -Sy --needed docker docker-compose docker-buildx
+sudo apt -y install lsb-release gnupg apt-transport-https ca-certificates curl software-properties-common
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/docker.gpg
+sudo add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+sudo apt update
+sudo apt install docker-ce docker-ce-cli containerd.io docker-compose-plugin
+
 sudo systemctl enable --now docker.service
 if ! getent group docker > /dev/null 2>&1; then
     sudo groupadd docker
@@ -22,28 +27,17 @@ sudo docker network create homelogic 2>/dev/null || true
 
 # Setup ZSH
 echo '### Setting up ZSH ###'
-if [ "${SHELL##*/}" != "zsh" ]; then
-    chsh -s /usr/bin/zsh
-fi
+touch ../.hushlogin
+cp -f .zshrc.base ../.zshrc
 
-sed -i '/# --- HOMELOGIC ALIASES START ---/,/# --- HOMELOGIC ALIASES END ---/d' ~/.zshrc 2>/dev/null || true
-sed -i '/# Custom aliases/,/alias restart=/d' ~/.zshrc 2>/dev/null || true
-{
-    echo '# --- HOMELOGIC ALIASES START ---'
-    echo '# Custom aliases'
-    echo 'alias la="ls -a"'
-    echo 'alias lah="ls -lah"'
-    echo "alias treesize='sudo du -sh \\* | sort -rh'"
-    echo "alias up='docker compose up -d'"
-    echo "alias down='docker compose down'"
-    echo "alias pull='docker compose pull && up'"
-    echo "alias token='openssl rand -hex 32'"
-    echo "alias shortToken='openssl rand -hex 16'"
-    echo "alias size='sudo du -sxh .'"
-    echo "alias ,,='..'"
-    echo "alias restart='down && up'"
-    echo '# --- HOMELOGIC ALIASES END ---'
-} >> ~/.zshrc
+sudo apt install zsh
+
+ZSH_PATH=$(command -v zsh)
+if [ "${SHELL##*/}" != "zsh" ] && [ -n "$ZSH_PATH" ]; then
+    chsh -s "$ZSH_PATH"
+fi
+git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
+sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 
 # Setup Tailscale
 echo '### Setting up Tailscale ###'