modified templates and lib/aliases.zsh