diff --git a/linux/.bashrc b/linux/.bashrc
deleted file mode 100644
index 3ded045..0000000
--- a/linux/.bashrc
+++ /dev/null
@@ -1,184 +0,0 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
-# If not running interactively, don't do anything
-case $- in
-*i*) ;;
-*) return ;;
-esac
-
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# If set, the pattern "**" used in a pathname expansion context will
-# match all files and zero or more directories and subdirectories.
-#shopt -s globstar
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
-	debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-xterm-color | *-256color) color_prompt=yes ;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
-	if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-		# We have color support; assume it's compliant with Ecma-48
-		# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-		# a case would tend to support setf rather than setaf.)
-		color_prompt=yes
-	else
-		color_prompt=
-	fi
-fi
-
-if [ "$color_prompt" = yes ]; then
-	PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
-	PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm* | rxvt*)
-	PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
-	;;
-*) ;;
-esac
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-	test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-	alias ls='ls --color=auto'
-	#alias dir='dir --color=auto'
-	#alias vdir='vdir --color=auto'
-
-	alias grep='grep --color=auto'
-	alias fgrep='fgrep --color=auto'
-	alias egrep='egrep --color=auto'
-fi
-
-# colored GCC warnings and errors
-#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-
-# some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-
-# Add an "alert" alias for long running commands.  Use like so:
-#   sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
-if [ -f ~/.bash_aliases ]; then
-	. ~/.bash_aliases
-fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if ! shopt -oq posix; then
-	if [ -f /usr/share/bash-completion/bash_completion ]; then
-		. /usr/share/bash-completion/bash_completion
-	elif [ -f /etc/bash_completion ]; then
-		. /etc/bash_completion
-	fi
-fi
-
-. "$HOME/.cargo/env"
-
-export PATH="/opt/nvim-linux64/bin:$PATH"
-
-set -o vi
-
-date
-
-# >>> conda initialize >>>
-# !! Contents within this block are managed by 'conda init' !!
-__conda_setup="$('/home/citoyen/miniconda3/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
-if [ $? -eq 0 ]; then
-    eval "$__conda_setup"
-else
-    if [ -f "/home/citoyen/miniconda3/etc/profile.d/conda.sh" ]; then
-        . "/home/citoyen/miniconda3/etc/profile.d/conda.sh"
-    else
-        export PATH="/home/citoyen/miniconda3/bin:$PATH"
-    fi
-fi
-unset __conda_setup
-# <<< conda initialize <<<
-
-
-alias g++='g++ -std=c++2b'
-alias nvim=/opt/nvim-linux64/bin/nvim
-alias python=python3
-alias v=nvim
-alias c=code
-alias bashcfg="nvim ~/.bashrc"
-alias zshcfg="nvim ~/.zshrc"
-alias nvimrc="nvim ~/.config/nvim/"
-
-set -o vi
-
-mcd ()
-{
-  mkdir -p -- "$1" && cd -P -- "$1"
-}
-cdls(){
-	cd $1
-	ls 
-}
-wsp(){
-	cd /home/citoyen/WSLFdr/
-	ls
-}
-doku() {
-  cd ~/doku/ && ls
-}
-source ~/.private.env.sheval "$(/bin/brew shellenv)"
-eval "$(/bin/brew shellenv)"
-
-# >>> juliaup initialize >>>
-
-# !! Contents within this block are managed by juliaup !!
-
-case ":$PATH:" in
-    *:/home/js0ny/.juliaup/bin:*)
-        ;;
-
-    *)
-        export PATH=/home/js0ny/.juliaup/bin${PATH:+:${PATH}}
-        ;;
-esac
-
-# <<< juliaup initialize <<<
diff --git a/linux/.zshrc b/linux/.zshrc
deleted file mode 100644
index ce6dade..0000000
--- a/linux/.zshrc
+++ /dev/null
@@ -1,183 +0,0 @@
-### Variables ###
-
-export DOTFILES="$HOME/.dotfiles"
-
-### ZSH Config ###
-set -o vi
-export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
-export ZSH="$HOME/.oh-my-zsh"
-ZSH_THEME="avit"
-# DISABLE_MAGIC_FUNCTIONS="true"
-# DISABLE_LS_COLORS="true"
-# DISABLE_AUTO_TITLE="true"
-# 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"
-HIST_STAMPS="yyyy-mm-dd"
-plugins=(git web-search jsontools z vi-mode zsh-autosuggestions)
-#plugins=(git web-search jsontools z vi-mode zsh-syntax-highlighting zsh-autosuggestions)
-source $ZSH/oh-my-zsh.sh
-
-# export MANPATH="/usr/local/man:$MANPATH"
-# export LANG= "en_US.UTF-8"
-export ARCHFLAGS="-arch x86_64"
-
-### Navigation ###
-
-# Relative navigation
-
-alias ..="cd .."
-alias ...="cd ../.."
-alias ....="cd ../../.."
-alias .....="cd ../../../.."
-alias ......="cd ../../../../.."
-
-# Absolute navigation
-
-alias doku="cd ~/doku && ls"
-alias dotfiles="cd $DOTFILES && ls"
-
-### Aliases ###
-
-# `alias` to list all aliases
-
-# PowerShell Equivalent #
-
-alias ni=touch
-alias cls=clear
-
-# Dev #
-
-alias g++='g++ -std=c++2b' # Set the default C++ standard to C++20
-alias gcc='gcc -std=c99' # Set the default C standard to C99
-alias cl='clang -std=c99'
-alias clpp='clang++ -std=c++2b'
-alias python=python3 # Set the default Python version to Python 3
-alias py=python # Alias for Python
-alias bashcfg="nvim ~/.bashrc"
-alias zshcfg="nvim ~/.zshrc"
-alias shcfg=zshcfg
-alias reload="source ~/.zshrc"
-alias nvimrc="nvim ~/.config/nvim/"
-alias ohmyzsh="code ~/.oh-my-zsh"
-alias pulldots="cd $DOTFILES && git pull"
-
-# Conda #
-
-alias pyact="conda activate"
-alias pylsenvs="conda env list"
-alias pydact="conda deactivate"
-
-# Git #
-
-
-
-
-# Editors #
-
-alias v=nvim
-alias c=code
-
-# Misc #
-
-alias cf=cfiles
-
-### Functions ###
-
-mcd() {
-  mkdir -p -- "$1" && cd -P -- "$1"
-}
-cdls(){
-	cd $1 && ls 
-}
-tc(){
-	touch $1 && code $1
-}
-tv(){
-	touch $1 && nvim $1
-}
-
-source ~/.private.env.sh
-
-### WSL Options ###
-
-# WSL open
-open() {
-  local target=$1
-
-  if command -v explorer.exe > /dev/null; then
-    explorer.exe "$target"
-  else
-    command open "$target"
-  fi
-}
-
-# WSL Neovide
-gvi() {
-  local target=$1
-
-  if command -v neovide.exe > /dev/null; then
-    neovide.exe "$target"
-  else
-    if command -v neovide > /dev/null; then
-      neovide "$target"
-    else
-      echo "neovide is not installed"
-    fi
-  fi
-}
-
-### Misc ###
-
-export PATH=/opt/bin:$PATH
-
-# Conda #
-
-# >>> conda initialize >>>
-# !! Contents within this block are managed by 'conda init' !!
-__conda_setup="$('/home/js0ny/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
-if [ $? -eq 0 ]; then
-    eval "$__conda_setup"
-else
-    if [ -f "/home/js0ny/miniconda3/etc/profile.d/conda.sh" ]; then
-        . "/home/js0ny/miniconda3/etc/profile.d/conda.sh"
-    else
-        export PATH="/home/js0ny/miniconda3/bin:$PATH"
-    fi
-fi
-unset __conda_setup
-# <<< conda initialize <<<
-
-# Ubuntu Command Not Found #
-
-if [[ -x /usr/lib/command-not-found ]] ; then
-        if (( ! ${+functions[command_not_found_handler]} )) ; then
-                function command_not_found_handler {
-                        [[ -x /usr/lib/command-not-found ]] || return 1
-                        /usr/lib/command-not-found -- ${1+"$1"} && :
-                }
-        fi
-fi
-
-# LinuxBrew #
-
-eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-# Set PATH, MANPATH, etc., for Homebrew.
-export HOMEBREW_BREW_GIT_REMOTE="https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/brew.git"
-export HOMEBREW_CORE_GIT_REMOTE="https://mirrors.tuna.tsinghua.edu.cn/git/homebrew/homebrew-core.git"
-
-# >>> juliaup initialize >>>
-
-# !! Contents within this block are managed by juliaup !!
-
-path=('/home/js0ny/.juliaup/bin' $path)
-export PATH
-
-# <<< juliaup initialize <<<
diff --git a/linux/readme.md b/linux/readme.md
deleted file mode 100644
index d7768a6..0000000
--- a/linux/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Configs for Linux
-
-## Navigator
-
-- [Bash Config](./.bashrc)
-- [Zsh Config](./.zshrc)
\ No newline at end of file
diff --git a/mac/.zshrc b/mac/.zshrc
index 5a564f2..b768643 100644
--- a/mac/.zshrc
+++ b/mac/.zshrc
@@ -1,45 +1,13 @@
+# ~/.config/zsh/.zshrc
+# ln -s ~/.dotfiles/wsl/.zshrc ~/.config/zsh/.zshrc
 ### Variables ###
 
 export DOTFILES="$HOME/.dotfiles"
-
-### ZSH Config ###
-set -o vi
-export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
-export ZSH="$HOME/.oh-my-zsh"
-ZSH_THEME="avit"
-# DISABLE_MAGIC_FUNCTIONS="true"
-# DISABLE_LS_COLORS="true"
-# DISABLE_AUTO_TITLE="true"
-# 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"
-HIST_STAMPS="yyyy-mm-dd"
-plugins=(git web-search jsontools z vi-mode zsh-syntax-highlighting zsh-autosuggestions)
-source $ZSH/oh-my-zsh.sh
-
-# export MANPATH="/usr/local/man:$MANPATH"
-# export LANG= "en_US.UTF-8"
+source $DOTFILES/zsh/*.zsh
 export ARCHFLAGS="-arch arm64"
 
 ### Navigation ###
-
-# Relative navigation
-
-alias ..="cd .."
-alias ...="cd ../.."
-alias ....="cd ../../.."
-alias .....="cd ../../../.."
-alias ......="cd ../../../../.."
-
 # Absolute navigation
-
 alias doku="cd ~/doku && ls"
 alias dotfiles="cd $DOTFILES && ls"
 alias docs="cd ~/Documents"
@@ -48,100 +16,6 @@ alias down="cd ~/Downloads"
 alias one="cd ~/OneDrive"
 alias gdrive="cd ~/Google\ Drive"
 
-### Aliases ###
-
-# `alias` to list all aliases
-
-# PowerShell Equivalent #
-
-alias ni=touch
-alias cls=clear
-
-# Dev #
-
-alias g++='g++ -std=c++2b' # Set the default C++ standard to C++20
-alias gcc='gcc -std=c99' # Set the default C standard to C99
-alias cl='clang -std=c99'
-alias clpp='clang++ -std=c++2b'
-alias python=python3 # Set the default Python version to Python 3
-alias py=python # Alias for Python
-alias bashcfg="nvim ~/.bashrc"
-alias zshcfg="nvim ~/.zshrc"
-alias shcfg=zshcfg
-alias reload="source ~/.zshrc"
-alias nvimrc="nvim ~/.config/nvim/"
-alias ohmyzsh="code ~/.oh-my-zsh"
-alias pulldots="cd $DOTFILES && git pull"
-
-# Conda #
-
-alias pyact="conda activate"
-alias pydact="conda deactivate"
-alias pylsenv="conda env list"
-alias pymkenv="conda create --name"
-
-# Git #
-
-
-
-
-# Editors #
-
-alias v=nvim
-alias c=code
-
-# Misc #
-
-alias cf=cfiles
-alias gdb=aarch64-elf-gdb
-
-### Functions ###
-
-mcd() {
-  mkdir -p -- "$0" && cd -P -- "$1"
-}
-cdls(){
-	cd $1 && ls 
-}
-tc(){
-	touch $1 && code $1
-}
-tv(){
-	touch $1 && nvim $1
-}
-
-source ~/.private.env.sh
-
-### WSL Options ###
-
-# WSL open
-open() {
-  local target=$1
-
-  if command -v explorer.exe > /dev/null; then
-    explorer.exe "$target"
-  else
-    command open "$target"
-  fi
-}
-
-# WSL Neovide
-gvi() {
-  local target=$1
-
-  if command -v neovide.exe > /dev/null; then
-    neovide.exe "$target"
-  else
-    if command -v neovide > /dev/null; then
-       neovide "$target" &
-    else
-      echo "neovide is not installed"
-    fi
-  fi
-}
-
-### Misc ###
-
 # >>> conda initialize >>>
 # !! Contents within this block are managed by 'conda init' !!
 __conda_setup="$('/opt/homebrew/Caskroom/miniconda/base/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
diff --git a/powershell/shared.ps1 b/powershell/Aliases.ps1
similarity index 59%
rename from powershell/shared.ps1
rename to powershell/Aliases.ps1
index fabbb36..147a4f6 100644
--- a/powershell/shared.ps1
+++ b/powershell/Aliases.ps1
@@ -1,25 +1,5 @@
 ### VARIABLES ###
 $EDITOR = "code"
-
-### Navigator ###
-
-# Relative navigation #
-# ${function:~}        = { Set-Location -Path ~ } cd is better
-${function:...}      = { Set-Location -Path ..\.. }
-${function:....}     = { Set-Location -Path ..\..\.. }
-${function:.....}    = { Set-Location -Path ..\..\..\.. }
-${function:......}   = { Set-Location -Path ..\..\..\..\.. }
-
-# Absolute navigation
-${function:docs}     = { Set-Location -Path ~/Documents }
-${function:down}     = { Set-Location -Path ~/Downloads }
-${function:dt}       = { Set-Location -Path ~/Desktop }
-${function:mytmp}    = { Set-Location -Path ~/Temp }
-${function:one}      = { Set-Location -Path ~/OneDrive }
-${function:doku}     = { Set-Location -Path ~/doku && Get-ChildItem }
-
-### Alias ###
-
 # Shell Equivalents #
 Set-Alias "touch" "New-Item"
 ${function:ll} = { Get-ChildItem -Force } 
@@ -54,7 +34,4 @@ ${function:pyact} = { conda activate $args[0] }
 ${function:pydact} = { conda deactivate }
 ${function:pylsenvs} = { conda env list }
 ${function:pymkenv} = { conda create --name $args[0] }
-${function:pyrmenv} = { conda remove --name $args[0] --all }
-
-
-# C & C++ #
+${function:pyrmenv} = { conda remove --name $args[0] --all }
\ No newline at end of file
diff --git a/powershell/keymap.ps1 b/powershell/Keymap.ps1
similarity index 100%
rename from powershell/keymap.ps1
rename to powershell/Keymap.ps1
diff --git a/powershell/modules.ps1 b/powershell/Modules.ps1
similarity index 100%
rename from powershell/modules.ps1
rename to powershell/Modules.ps1
diff --git a/powershell/Navigation.ps1 b/powershell/Navigation.ps1
new file mode 100644
index 0000000..67e9f19
--- /dev/null
+++ b/powershell/Navigation.ps1
@@ -0,0 +1,13 @@
+# ${function:~}        = { Set-Location -Path ~ } cd is better
+${function:...}      = { Set-Location -Path ..\.. }
+${function:....}     = { Set-Location -Path ..\..\.. }
+${function:.....}    = { Set-Location -Path ..\..\..\.. }
+${function:......}   = { Set-Location -Path ..\..\..\..\.. }
+
+# Absolute navigation
+${function:docs}     = { Set-Location -Path ~/Documents }
+${function:down}     = { Set-Location -Path ~/Downloads }
+${function:dt}       = { Set-Location -Path ~/Desktop }
+${function:mytmp}    = { Set-Location -Path ~/Temp }
+${function:one}      = { Set-Location -Path ~/OneDrive }
+${function:doku}     = { Set-Location -Path ~/doku && Get-ChildItem }
\ No newline at end of file
diff --git a/powershell/prompt.ps1 b/powershell/Prompt.ps1
similarity index 100%
rename from powershell/prompt.ps1
rename to powershell/Prompt.ps1
diff --git a/powershell/scripts.ps1 b/powershell/Scripts.ps1
similarity index 100%
rename from powershell/scripts.ps1
rename to powershell/Scripts.ps1
diff --git a/wsl/.zshrc b/wsl/.zshrc
new file mode 100644
index 0000000..0114436
--- /dev/null
+++ b/wsl/.zshrc
@@ -0,0 +1,86 @@
+# ~/.config/zsh/.zshrc
+# ln -s ~/.dotfiles/wsl/.zshrc ~/.config/zsh/.zshrc
+### Variables ###
+
+export DOTFILES="$HOME/.dotfiles"
+source $DOTFILES/zsh/*.zsh
+export ARCHFLAGS="-arch x86_64"
+
+# Absolute navigation
+alias src="cd ~/Source && ls"
+alias dotfiles="cd $DOTFILES && ls"
+
+
+### WSL Options ###
+
+# WSL open
+open() {
+  local target=$1
+
+  if command -v explorer.exe > /dev/null; then
+    explorer.exe "$target"
+  else
+    command open "$target"
+  fi
+}
+
+# WSL Neovide
+gvi() {
+  local target=$1
+
+  if command -v neovide.exe > /dev/null; then
+    neovide.exe "$target"
+  else
+    if command -v neovide > /dev/null; then
+      neovide "$target"
+    else
+      echo "neovide is not installed"
+    fi
+  fi
+}
+
+### Misc ###
+
+export PATH=/opt/bin:$PATH
+
+# Conda #
+
+# >>> conda initialize >>>
+# !! Contents within this block are managed by 'conda init' !!
+__conda_setup="$('/home/js0ny/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
+if [ $? -eq 0 ]; then
+    eval "$__conda_setup"
+else
+    if [ -f "/home/js0ny/miniconda3/etc/profile.d/conda.sh" ]; then
+        . "/home/js0ny/miniconda3/etc/profile.d/conda.sh"
+    else
+        export PATH="/home/js0ny/miniconda3/bin:$PATH"
+    fi
+fi
+unset __conda_setup
+# <<< conda initialize <<<
+
+# Ubuntu Command Not Found #
+
+if [[ -x /usr/lib/command-not-found ]] ; then
+        if (( ! ${+functions[command_not_found_handler]} )) ; then
+                function command_not_found_handler {
+                        [[ -x /usr/lib/command-not-found ]] || return 1
+                        /usr/lib/command-not-found -- ${1+"$1"} && :
+                }
+        fi
+fi
+
+# LinuxBrew #
+
+eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+# Set PATH, MANPATH, etc., for Homebrew.
+
+# >>> juliaup initialize >>>
+
+# !! Contents within this block are managed by juliaup !!
+
+path=('/home/js0ny/.juliaup/bin' $path)
+export PATH
+
+# <<< juliaup initialize <<<
diff --git a/zsh/.zshenv b/zsh/.zshenv
new file mode 100644
index 0000000..82779fe
--- /dev/null
+++ b/zsh/.zshenv
@@ -0,0 +1,7 @@
+# ~/.zshenv
+# ln -s ~/.dotfiles/zsh/.zshenv ~/.zshenv
+# This file is sourced by all zsh sessions upon startup.
+
+# Use XDG Base Directory Specification
+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+export ZDOTDIR="${XDG_CONFIG_HOME}/zsh"
diff --git a/zsh/alias.zsh b/zsh/alias.zsh
new file mode 100644
index 0000000..9d0ae14
--- /dev/null
+++ b/zsh/alias.zsh
@@ -0,0 +1,45 @@
+# PowerShell Equivalent #
+alias ni=touch
+alias cls=clear
+
+# Dev #
+alias g++='g++ -std=c++2b' # Set the default C++ standard to C++20
+alias gcc='gcc -std=c99' # Set the default C standard to C99
+alias cl='clang -std=c99'
+alias clpp='clang++ -std=c++2b'
+alias python=python3 # Set the default Python version to Python 3
+alias py=python # Alias for Python
+alias bashcfg="nvim ~/.bashrc"
+alias zshcfg="nvim ~/.zshrc"
+alias shcfg=zshcfg
+alias reload="source ~/.zshrc"
+alias nvimrc="nvim ~/.config/nvim/"
+alias ohmyzsh="code ~/.oh-my-zsh"
+alias pulldots="cd $DOTFILES && git pull"
+
+# Conda #
+alias pyact="conda activate"
+alias pydact="conda deactivate"
+alias pylsenv="conda env list"
+alias pymkenv="conda create --name"
+
+# Editors #
+alias v=nvim
+alias c=code
+
+# Misc #
+alias cf=cfiles
+
+# Functions #
+mcd() {
+  mkdir -p -- "$0" && cd -P -- "$1"
+}
+cdls(){
+	cd $1 && ls 
+}
+tc(){
+	touch $1 && code $1
+}
+tv(){
+	touch $1 && nvim $1
+}
\ No newline at end of file
diff --git a/zsh/config.zsh b/zsh/config.zsh
new file mode 100644
index 0000000..9697b09
--- /dev/null
+++ b/zsh/config.zsh
@@ -0,0 +1,24 @@
+### ZSH Config ###
+export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
+export ZSH="$HOME/.oh-my-zsh"
+ZSH_THEME="avit"
+# DISABLE_MAGIC_FUNCTIONS="true"
+# DISABLE_LS_COLORS="true"
+# DISABLE_AUTO_TITLE="true"
+# 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"
+HIST_STAMPS="yyyy-mm-dd"
+plugins=(git web-search jsontools z vi-mode zsh-syntax-highlighting zsh-autosuggestions)
+source $ZSH/oh-my-zsh.sh
+source .private.env.sh
+
+# export MANPATH="/usr/local/man:$MANPATH"
+# export LANG= "en_US.UTF-8"
\ No newline at end of file
diff --git a/zsh/keymap.zsh b/zsh/keymap.zsh
new file mode 100644
index 0000000..9a51834
--- /dev/null
+++ b/zsh/keymap.zsh
@@ -0,0 +1,20 @@
+# ~/.dotfiles/keymap.zsh
+bindkey -v # Vi Keybindings
+
+# Colemak hnei
+# bindkey -M vicmd 'h' vi-backward-char # No change
+bindkey -M vicmd 'n' down-line-or-history 
+bindkey -M vicmd 'e' up-line-or-history 
+bindkey -M vicmd 'i' vi-forward-char 
+
+# Similar position to [i] in QWERTY
+bindkey -M vicmd 'l' vi-insert
+bindkey -M vicmd 'L' vi-insert-bol
+# Ne{[k]s}t
+bindkey -M vicmd 'k' vi-repeat-search
+bindkey -M vicmd 'K' vi-rev-repeat-search
+# [J]ump
+bindkey -M vicmd 'j' vi-forward-word-end
+bindkey -M vicmd 'J' vi-forward-blank-word-end
+# Use N to Join
+bindkey -M vicmd 'N' vi-join
\ No newline at end of file
diff --git a/zsh/navi.zsh b/zsh/navi.zsh
new file mode 100644
index 0000000..f19eef6
--- /dev/null
+++ b/zsh/navi.zsh
@@ -0,0 +1,7 @@
+
+# Relative navigation
+alias ..="cd .."
+alias ...="cd ../.."
+alias ....="cd ../../.."
+alias .....="cd ../../../.."
+alias ......="cd ../../../../.."
\ No newline at end of file