diff --git a/dot_zshrc b/dot_zshrc
index d8efb69..d8d7102 100644
--- a/dot_zshrc
+++ b/dot_zshrc
@@ -55,7 +55,7 @@ HIST_STAMPS="yyyy-mm-dd"
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
 # plugins=(git)
-plugins=(sudo taskwarrior common-aliases git-flow vi-mode fzf python poetry)
+plugins=(sudo taskwarrior timewarrior common-aliases git-flow vi-mode fzf python poetry)
 #plugins+=(zsh-vi-mode)
 plugins+=(fzf-tab)
 plugins+=(docker)
@@ -87,23 +87,20 @@ show_virtual_env() {
 #--------- End of direnv block ------------------------------------------------  
 
 unsetopt histverify
-alias in='task add +in'
 alias rtask="task rc:/home/kellya/.taskrc_tinslin"
-alias atwork="task context work"
-alias athome="task context home"
-alias atschool="task context school"
-alias atnone="task context none;"
 alias icat="kitty +kitten icat"
 alias d="kitty +kitten diff"
 #eval "$(ntfy shell-integration)"
 #source /usr/share/gems/gems/tmuxinator-0.6.11/completion/tmuxinator.zsh
 source ~/.private_aliases
+#Load taskwarrior alias file
+source ~/.taskwarrior_aliases/taskwarrior_aliases
+
 source /usr/bin/virtualenvwrapper.sh
 
 
 #Aliases
 alias dum='du -sh *|egrep ".*\.?[0-9]M"'
-alias keploy='echo -e "\e[101;97mKeploy was removed, its functionality is already built in ssh-copy-id, just use that\e[49m"; ssh-copy-id'
 alias shrug='curl shrug.io|xclip'
 alias weather='curl wttr.in'
 alias ipython='ipython --no-confirm-exit'
@@ -192,6 +189,3 @@ PROG=tea _CLI_ZSH_AUTOCOMPLETE_HACK=1 source /home/kellya/.config/tea/autocomple
 export PATH="/home/kellya/.deta/bin:$PATH"
 
 eval $(thefuck --alias)
-
-#Load taskwarrior alias file
-source ~/.taskwarrior_aliases/taskwarrior_aliases