diff --git a/.compton.conf b/.compton.conf
deleted file mode 100644
index bd9c8dd..0000000
--- a/.compton.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-vsync = "opengl-swc";
-backend = "glx";
-
-shadow = false;
-#shadow-radius = 10;
-#shadow-offset-x = -5;
-#shadow-offset-y = 0;
-#shadow-opacity = 0.8;
-#shadow-red = 0.11;
-#shadow-green = 0.12;
-#shadow-blue = 0.13;
-shadow-exclude = [
-  "name = 'Notification'",
-  "_GTK_FRAME_EXTENTS@:c",
-  "class_g = 'i3-frame'",
-  "_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'",
-  "_NET_WM_STATE@:32a *= '_NET_WM_STATE_STICKY'",
-  "!I3_FLOATING_WINDOW@:c"
-];
-shadow-ignore-shaped = true;
-
-blur-background = false;
-blur-background-fixed = true;
-blur-kern = "7x7box";
-blur-background-exclude = [
-  "class_g = 'i3-frame'",
-  "window_type = 'dock'",
-  "window_type = 'desktop'",
-  "_GTK_FRAME_EXTENTS@:c"
-];
-
-# Duplicating the _NET_WM_STATE entries because compton cannot deal with atom arrays :-/
-opacity-rule = [
-  "90:class_g = 'URxvt' && focused",
-  "60:class_g = 'URxvt' && !focused",
-  "97:class_g = 'Termite' && !_NET_WM_STATE@:32a",
-
-#  "0:_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_HIDDEN' && !I3_FLOATING_WINDOW@:c",
-#  "0:_NET_WM_STATE@[1]:32a = '_NET_WM_STATE_HIDDEN' && !I3_FLOATING_WINDOW@:c",
-#  "0:_NET_WM_STATE@[2]:32a = '_NET_WM_STATE_HIDDEN' && !I3_FLOATING_WINDOW@:c",
-#  "0:_NET_WM_STATE@[3]:32a = '_NET_WM_STATE_HIDDEN' && !I3_FLOATING_WINDOW@:c",
-#  "0:_NET_WM_STATE@[4]:32a = '_NET_WM_STATE_HIDDEN' && !I3_FLOATING_WINDOW@:c",
-
-  "90:_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_STICKY'",
-  "90:_NET_WM_STATE@[1]:32a = '_NET_WM_STATE_STICKY'",
-  "90:_NET_WM_STATE@[2]:32a = '_NET_WM_STATE_STICKY'",
-  "90:_NET_WM_STATE@[3]:32a = '_NET_WM_STATE_STICKY'",
-  "90:_NET_WM_STATE@[4]:32a = '_NET_WM_STATE_STICKY'"
-];
-
-fading = false;
-fade-delta = 7;
-fade-in-step = 0.05;
-fade-out-step = 0.05;
-fade-exclude = [];
-
-mark-wmwin-focused = true;
-mark-ovredir-focused = true;
-use-ewmh-active-win = true;
-detect-rounded-corners = true;
-detect-client-opacity = true;
-refresh-rate = 0;
-dbe = false;
-glx-no-stencil = true;
-glx-copy-from-front = false;
-unredir-if-possible = false;
-focus-exclude = [];
-detect-transient = true;
-detect-client-leader = true;
-invert-color-include = [];
-
-wintypes: {
-    tooltip = { fade = true; shadow = false; opacity = 1.00; focus = true; };
-    dock = { shadow = false };
-    dnd = { shadow = false };
-};
diff --git a/.zshrc b/.zshrc
index f5c0098..c0d60dd 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,3 +1,106 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/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="robbyrussell"
+
+# 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)
+
+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='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# 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 the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+#
+
 export PATH=$PATH:"$GOPATH/bin:$HOME/scripts"
 export GOPATH=$HOME/go
 
@@ -6,5 +109,3 @@ export XDG_CONFIG_HOME="$HOME/.config"
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-
-eval "$(starship init zsh)"
diff --git a/starship.toml b/starship.toml
deleted file mode 100644
index 6302cff..0000000
--- a/starship.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Get editor completions based on the config schema
-"$schema" = 'https://starship.rs/config-schema.json'
-
-# Inserts a blank line between shell prompts
-add_newline = true
-
-[character] 
-success_symbol = '[󰄾](bold green)' 
-error_symbol = '[󰄾](bold red)'
-vimcmd_symbol = '[V](bold green) '
-
-# Disable the package module, hiding it from the prompt completely
-[package]
-disabled = true
-
-[golang]
-format = '[[Go](bold cyan)-$version](cyan)'