diff --git a/.zshrc b/.zshrc
deleted file mode 100644
index 8f4955d..0000000
--- a/.zshrc
+++ /dev/null
@@ -1,53 +0,0 @@
-export MISE_SHELL=zsh
-export __MISE_ORIG_PATH="$PATH"
-
-mise() {
-  local command
-  command="${1:-}"
-  if [ "$#" = 0 ]; then
-    command mise
-    return
-  fi
-  shift
-
-  case "$command" in
-  deactivate|shell|sh)
-    # if argv doesn't contains -h,--help
-    if [[ ! " $@ " =~ " --help " ]] && [[ ! " $@ " =~ " -h " ]]; then
-      eval "$(command mise "$command" "$@")"
-      return $?
-    fi
-    ;;
-  esac
-  command mise "$command" "$@"
-}
-
-_mise_hook() {
-  eval "$(mise hook-env -s zsh)";
-}
-typeset -ag precmd_functions;
-if [[ -z "${precmd_functions[(r)_mise_hook]+1}" ]]; then
-  precmd_functions=( _mise_hook ${precmd_functions[@]} )
-fi
-typeset -ag chpwd_functions;
-if [[ -z "${chpwd_functions[(r)_mise_hook]+1}" ]]; then
-  chpwd_functions=( _mise_hook ${chpwd_functions[@]} )
-fi
-
-_mise_hook
-if [ -z "${_mise_cmd_not_found:-}" ]; then
-    _mise_cmd_not_found=1
-    [ -n "$(declare -f command_not_found_handler)" ] && eval "${$(declare -f command_not_found_handler)/command_not_found_handler/_command_not_found_handler}"
-
-    function command_not_found_handler() {
-        if [[ "$1" != "mise" && "$1" != "mise-"* ]] && mise hook-not-found -s zsh -- "$1"; then
-          _mise_hook
-          "$@"
-        elif [ -n "$(declare -f _command_not_found_handler)" ]; then
-            _command_not_found_handler "$@"
-        else
-            echo "zsh: command not found: $1" >&2
-            return 127
-        fi
-    }
-fi
diff --git a/alias.sh b/alias.sh
deleted file mode 100644
index f6bb04d..0000000
--- a/alias.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#alias history='history -f'
-#alias ssh='/usr/bin/ssh -F ~/Nextcloud/dotfiles-git/rcdirs/ssh/config'
-#alias scp='/usr/bin/scp -F ~/Nextcloud/dotfiles-git/rcdirs/ssh/config'
-alias s='ssh'
-alias vi='vim'
-alias id0='sudo -i'
-alias ls='ls --color'
-alias grep='rg --color auto'
-alias wget='wget --no-check-certificate'
-alias curl='curl --insecure'
-alias cls='clear ; ls'
-
-#Git / git stuff
-alias gup='git pull'
-alias lpom='git add -A :/ ; git commit -va'
-alias gpom=' git push --tags origin master'
-alias tesla='gup;lpom;gpom'
-
-#Docker / k8s aliases, cause i'm a docker/kubefarm fanboi now
-
-## Most docker/k8s use is via vscode now, but somtimes you wanna drop to a shell and do some stuff...
-
-alias dc='docker-compose'
-alias dcu='docker compose up'
-alias dcd='docker compose down'
-
-alias dcdu='docker compose up -d'
-
-
-alias dcf='docker-compose rm -f ; docker-compose up'
-alias dcd-prod='docker-compose --context prod up -d'
-alias dcd-cicd='docker-compose --context cicd up -d'
-alias dcd-dev='docker-compose --context dev up -d'
-
-alias kgn='kubectl get nodes -o wide|grep -v NAME|sort'
-alias kgp='kubectl get pods -A -o wide|grep -v NAME|sort'
-
-alias k0-sb-gn='export KUBECONFIG=~/.kube/custom-contexts/context-sandbox-config.yml ; kgn'
-alias k0-sb-gp='export KUBECONFIG=~/.kube/custom-contexts/context-sandbox-config.yml ; kgp'
-
-alias k0-dqu-gn='export KUBECONFIG=~/.kube/custom-contexts/context-dqu-config.yml ; kgn'
-alias k0-dqu-gp='export KUBECONFIG=~/.kube/custom-contexts/context-dqu-config.yml ; kgp'
-
-alias k0-prod-gn='export KUBECONFIG=~/.kube/custom-contexts/context-prod-config.yml ; kgn'
-alias k0-prod-gp='export KUBECONFIG=~/.kube/custom-contexts/context-prod-config.yml ; kgp'
-
-
-#Projects
-
-### Documentaton
-alias context-docs-techops='StartProject.sh ~/charles/code/techops/docs-techops'
-alias context-notes-public='StartProject.sh ~/charles/notes-public'
-alias context-docs-subo='StartProject.sh ~/charles/code/RD/docs-suborbital'
-alias context-docs-rr='StartProject.sh ~/charles/code/RD/docs-rackrental'
-
-### Configs
-alias context-dotfiles='StartProject.sh ~/charles/dotfiles-git'
-alias context-tsys-dev='StartProject.sh ~/charles/code/techops/tsys-dev'
-
-### Code - internal
-alias context-rd-MorseFlyer='StartProject.sh ~/charles/RD/Morse/Internal/'
-
-### Code - BizOps/TechOps
-alias context-services-bizops='StartProject.sh ~/charles/code/techops/ITBackOfficeFLOStack'
-
-
-
-#alias tmux='TERMINFO=/usr/share/terminfo/x/xterm-16color TERM=xterm-16color tmux -2'
-
-
-#####################################################
-#Personal host variables
-#####################################################
-#Eventually we'll move to ldap/no shared accounts/forced sudo. Blech. Corporate tyrany!
-#For now, the easy way. HAH!
-#CON_USER="charlesnw"
-#INBAND_USER="charlesnw"
-PERSONAL_OOB_USER="root"
-PERSONAL_INBAND_USER="root"
-#####################################################
-
-#Functions to deploy on ultix and/or charles-prodlin...
-#alias 2600hz='ssh $INBAND_USER@conference.corp.thefnf.net' 
-#alias yacy='ssh $INBAND_USER@yacyfnf.corp.thefnf.net'
-#alias confine='ssh $INBAND_USER@confine.dev.thefnf.net' 
-
-#FNF hosts
-alias tsys-fnf-freedomstack='ssh charles@tsys-fnf-freedomstack' #FreedomStack dev vm
-alias hearth-at='ssh charles@hearth-at.thefnf.net'
-alias hearth-an='ssh charles@hearth-an.thefnf.net'
-alias hearth-bds='ssh charles@hearth-bds.thefnf.net'
-alias hearth-uds='ssh charles@hearth-uds.thefnf.net'
-
-#####################################################
-#PFV HOSTS #####################################################
-#Bare metal systems (in band access) - Production 
-#Upstairs, production
-alias ausprod-core-ap01='telnet ausprod-core-ap01.turnsys.net'
-alias ausprod-core-sw01='telnet ausprod-core-sw01.turnsys.net'
-
-#alias netbox='ssh -i $PATH_TO_KEY $LABUSER@netbox.dev.thefnf.net' #gns3 with ios/juniper/comware/extreme os/tinycore/openflow (ALL THE NETWORK THINGS)
-#alias cudasys='ssh -i $PATH_TO_KEY $LABUSER@cudasys.dev.thefnf.net' #cuda awesomeness
-
-GIT_SSH_COMMAND='ssh -i ~/Nextcloud/secrets/ssh/ReachableCEOPrivateSSHKey -o IdentitiesOnly=yes'
-
-###########################################################
-#Inband access (ssh/telnet)				  #
-###########################################################
-#alias rr-con-sw4='ssh $RRLABUSER:7003@ausprod.consrv.turnsys.net'
-#alias rr-con-r7='ssh $RRLABUSER:7021@ausprod-consrv.turnsys.net'
-#TBDalias rr-con-r8='ssh $RRLABUSER:7021@ausprod-consrv.turnsys.net'
-#TBDalias rr-con-r10='ssh $RRLABUSER:7021@ausprod-consrv.turnsys.net'
-###########################################################
-
-alias hb='habitctl'
-
-#rrom https://www.ackama.com/what-we-think/the-best-way-to-store-your-dotfiles-a-bare-git-repository-explained/
-alias dfile='/usr/bin/git --git-dir=$HOME/.cfg/.git/ --work-tree=$HOME'
-alias dadd='dfile add $1 ; dfile commit -m "added $1"'
diff --git a/bin/MiscEnvVars b/bin/MiscEnvVars
deleted file mode 100644
index 35c8e82..0000000
--- a/bin/MiscEnvVars
+++ /dev/null
@@ -1,10 +0,0 @@
-########
-#All things related to hacking on reqfoot
-########
-
-export REQDEV_VMHOST="10.251.30.72"
-export REQDEV_VMHOST_ADMINUSER="root"
-export REQDEV_VMNAME="ReqTSYSCICDTest"
-export REQDEV_VMNAME_USER="localuser"
-export REQDEV_VMIP="10.251.100."
-########
diff --git a/bin/alias.sh b/bin/alias.sh
deleted file mode 100644
index 9f32c47..0000000
--- a/bin/alias.sh
+++ /dev/null
@@ -1,112 +0,0 @@
-#alias history='history -f'
-alias ssh='/usr/bin/ssh -F ~/Nextcloud/dotfiles-git/rcdirs/ssh/config'
-alias scp='scp -i /drives/c/Users/reach/.ssh/id_rsa -F ~/Nextcloud/dotfiles-git/rcdirs/ssh/config'
-alias s='ssh'
-alias vi='vim'
-alias id0='sudo -i'
-alias ls='ls --color'
-alias grep='rg --color auto'
-alias wget='wget --no-check-certificate'
-alias curl='curl --insecure'
-alias cls='clear ; ls'
-
-#Git / git stuff
-alias gup='git pull'
-alias lpom='git add -A :/ ; git commit -va'
-alias gpom=' git push --tags origin master'
-alias tesla='gup;lpom;gpom'
-
-#Docker / k8s aliases, cause i'm a docker/kubefarm fanboi now
-
-## Most docker/k8s use is via vscode now, but somtimes you wanna drop to a shell and do some stuff...
-
-alias dc='docker-compose'
-alias dcu='docker compose up'
-alias dcd='docker compose down'
-
-alias dcdu='docker compose up -d'
-
-
-alias dcf='docker-compose rm -f ; docker-compose up'
-alias dcd-prod='docker-compose --context prod up -d'
-alias dcd-cicd='docker-compose --context cicd up -d'
-alias dcd-dev='docker-compose --context dev up -d'
-
-alias kgn='kubectl get nodes -o wide|grep -v NAME|sort'
-alias kgp='kubectl get pods -A -o wide|grep -v NAME|sort'
-
-alias k0-sb-gn='export KUBECONFIG=~/.kube/custom-contexts/context-sandbox-config.yml ; kgn'
-alias k0-sb-gp='export KUBECONFIG=~/.kube/custom-contexts/context-sandbox-config.yml ; kgp'
-
-alias k0-dqu-gn='export KUBECONFIG=~/.kube/custom-contexts/context-dqu-config.yml ; kgn'
-alias k0-dqu-gp='export KUBECONFIG=~/.kube/custom-contexts/context-dqu-config.yml ; kgp'
-
-alias k0-prod-gn='export KUBECONFIG=~/.kube/custom-contexts/context-prod-config.yml ; kgn'
-alias k0-prod-gp='export KUBECONFIG=~/.kube/custom-contexts/context-prod-config.yml ; kgp'
-
-
-#Projects
-
-### Documentaton
-alias context-docs-techops='StartProject.sh ~/charles/code/techops/docs-techops'
-alias context-notes-public='StartProject.sh ~/charles/notes-public'
-alias context-docs-subo='StartProject.sh ~/charles/code/RD/docs-suborbital'
-alias context-docs-rr='StartProject.sh ~/charles/code/RD/docs-rackrental'
-
-### Configs
-alias context-dotfiles='StartProject.sh ~/charles/dotfiles-git'
-alias context-tsys-dev='StartProject.sh ~/charles/code/techops/tsys-dev'
-
-### Code - internal
-alias context-rd-MorseFlyer='StartProject.sh ~/charles/RD/Morse/Internal/'
-
-### Code - BizOps/TechOps
-alias context-services-bizops='StartProject.sh ~/charles/code/techops/ITBackOfficeFLOStack'
-
-
-
-#alias tmux='TERMINFO=/usr/share/terminfo/x/xterm-16color TERM=xterm-16color tmux -2'
-
-
-#####################################################
-#Personal host variables
-#####################################################
-#Eventually we'll move to ldap/no shared accounts/forced sudo. Blech. Corporate tyrany!
-#For now, the easy way. HAH!
-#CON_USER="charlesnw"
-#INBAND_USER="charlesnw"
-PERSONAL_OOB_USER="root"
-PERSONAL_INBAND_USER="root"
-#####################################################
-
-#Functions to deploy on ultix and/or charles-prodlin...
-#alias 2600hz='ssh $INBAND_USER@conference.corp.thefnf.net' 
-#alias yacy='ssh $INBAND_USER@yacyfnf.corp.thefnf.net'
-#alias confine='ssh $INBAND_USER@confine.dev.thefnf.net' 
-
-#FNF hosts
-alias tsys-fnf-freedomstack='ssh charles@tsys-fnf-freedomstack' #FreedomStack dev vm
-alias hearth-at='ssh charles@hearth-at.thefnf.net'
-alias hearth-an='ssh charles@hearth-an.thefnf.net'
-alias hearth-bds='ssh charles@hearth-bds.thefnf.net'
-alias hearth-uds='ssh charles@hearth-uds.thefnf.net'
-
-#####################################################
-#PFV HOSTS #####################################################
-#Bare metal systems (in band access) - Production 
-#Upstairs, production
-alias ausprod-core-ap01='telnet ausprod-core-ap01.turnsys.net'
-alias ausprod-core-sw01='telnet ausprod-core-sw01.turnsys.net'
-
-#alias netbox='ssh -i $PATH_TO_KEY $LABUSER@netbox.dev.thefnf.net' #gns3 with ios/juniper/comware/extreme os/tinycore/openflow (ALL THE NETWORK THINGS)
-#alias cudasys='ssh -i $PATH_TO_KEY $LABUSER@cudasys.dev.thefnf.net' #cuda awesomeness
-
-###########################################################
-#Inband access (ssh/telnet)				  #
-###########################################################
-#alias rr-con-sw4='ssh $RRLABUSER:7003@ausprod.consrv.turnsys.net'
-#alias rr-con-r7='ssh $RRLABUSER:7021@ausprod-consrv.turnsys.net'
-#TBDalias rr-con-r8='ssh $RRLABUSER:7021@ausprod-consrv.turnsys.net'
-#TBDalias rr-con-r10='ssh $RRLABUSER:7021@ausprod-consrv.turnsys.net'
-###########################################################
-
diff --git a/reachableceo-zshrc b/reachableceo-zshrc
index 01b6558..ab5a46d 100644
--- a/reachableceo-zshrc
+++ b/reachableceo-zshrc
@@ -255,4 +255,5 @@ fi
 # enable command-not-found if installed
 if [ -f /etc/zsh_command_not_found ]; then
     . /etc/zsh_command_not_found
-fi
\ No newline at end of file
+fi
+
diff --git a/zshrc-include-cnw.sh b/zshrc-include-cnw.sh
index 25f8dbe..0adbf3a 100644
--- a/zshrc-include-cnw.sh
+++ b/zshrc-include-cnw.sh
@@ -1,15 +1,15 @@
 #Customized zshrc 
 # CNW
-# Last updated 03/01/2021
+# Last updated 07/11/2025
 # merging my own bits and some stuff from oh-my-zsh, powerline etc
 
-# 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`.
-#
+###################################
+# MISE
+###################################
+eval "$(mise activate zsh)"
+###################################
+
 
-source ~/alias.sh
 
 ###############
 #My path is where I walk, not where you walk
@@ -76,3 +76,140 @@ PERSONAL_OOB_USER="root"
 PERSONAL_INBAND_USER="root"
 #####################################################
 
+# 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`.
+#
+
+#alias ssh='/usr/bin/ssh -F ~/Nextcloud/dotfiles-git/rcdirs/ssh/config'
+#alias scp='/usr/bin/scp -F ~/Nextcloud/dotfiles-git/rcdirs/ssh/config'
+#alias ssh='/usr/bin/ssh -F ~/Nextcloud/dotfiles-git/rcdirs/ssh/config'
+#alias scp='scp -i /drives/c/Users/reach/.ssh/id_rsa -F ~/Nextcloud/dotfiles-git/rcdirs/ssh/config'
+alias s='ssh'
+
+#alias history='history -f'
+alias vi='vim'
+
+alias id0='sudo -i'
+
+alias ls='ls --color'
+alias grep='rg --color auto'
+alias wget='wget --no-check-certificate'
+alias curl='curl --insecure'
+alias cls='clear ; ls'
+
+#Git / git stuff
+alias gup='git pull'
+alias lpom='git add -A :/ ; git commit -va'
+alias gpom=' git push --tags origin master'
+alias tesla='gup;lpom;gpom'
+
+#Docker / k8s aliases, cause i'm a docker/kubefarm fanboi now
+
+## Most docker/k8s use is via vscode now, but somtimes you wanna drop to a shell and do some stuff...
+
+alias dc='docker-compose'
+alias dcu='docker compose up'
+alias dcd='docker compose down'
+alias dcdu='docker compose up -d'
+alias dcf='docker-compose rm -f ; docker-compose up'
+alias dcd-prod='docker-compose --context prod up -d'
+alias dcd-cicd='docker-compose --context cicd up -d'
+alias dcd-dev='docker-compose --context dev up -d'
+
+alias kgn='kubectl get nodes -o wide|grep -v NAME|sort'
+alias kgp='kubectl get pods -A -o wide|grep -v NAME|sort'
+
+alias k0-sb-gn='export KUBECONFIG=~/.kube/custom-contexts/context-sandbox-config.yml ; kgn'
+alias k0-sb-gp='export KUBECONFIG=~/.kube/custom-contexts/context-sandbox-config.yml ; kgp'
+
+alias k0-dqu-gn='export KUBECONFIG=~/.kube/custom-contexts/context-dqu-config.yml ; kgn'
+alias k0-dqu-gp='export KUBECONFIG=~/.kube/custom-contexts/context-dqu-config.yml ; kgp'
+
+alias k0-prod-gn='export KUBECONFIG=~/.kube/custom-contexts/context-prod-config.yml ; kgn'
+alias k0-prod-gp='export KUBECONFIG=~/.kube/custom-contexts/context-prod-config.yml ; kgp'
+
+#Projects
+
+### Documentaton
+alias context-docs-techops='StartProject.sh ~/charles/code/techops/docs-techops'
+alias context-notes-public='StartProject.sh ~/charles/notes-public'
+alias context-docs-subo='StartProject.sh ~/charles/code/RD/docs-suborbital'
+alias context-docs-rr='StartProject.sh ~/charles/code/RD/docs-rackrental'
+
+### Configs
+alias context-dotfiles='StartProject.sh ~/charles/dotfiles-git'
+alias context-tsys-dev='StartProject.sh ~/charles/code/techops/tsys-dev'
+
+### Code - internal
+alias context-rd-MorseFlyer='StartProject.sh ~/charles/RD/Morse/Internal/'
+
+### Code - BizOps/TechOps
+alias context-services-bizops='StartProject.sh ~/charles/code/techops/ITBackOfficeFLOStack'
+
+
+
+#alias tmux='TERMINFO=/usr/share/terminfo/x/xterm-16color TERM=xterm-16color tmux -2'
+
+
+#####################################################
+#Personal host variables
+#####################################################
+#Eventually we'll move to ldap/no shared accounts/forced sudo. Blech. Corporate tyrany!
+#For now, the easy way. HAH!
+#CON_USER="charlesnw"
+#INBAND_USER="charlesnw"
+PERSONAL_OOB_USER="root"
+PERSONAL_INBAND_USER="root"
+#####################################################
+
+#Functions to deploy on ultix and/or charles-prodlin...
+#alias 2600hz='ssh $INBAND_USER@conference.corp.thefnf.net' 
+#alias yacy='ssh $INBAND_USER@yacyfnf.corp.thefnf.net'
+#alias confine='ssh $INBAND_USER@confine.dev.thefnf.net' 
+
+#FNF hosts
+alias tsys-fnf-freedomstack='ssh charles@tsys-fnf-freedomstack' #FreedomStack dev vm
+alias hearth-at='ssh charles@hearth-at.thefnf.net'
+alias hearth-an='ssh charles@hearth-an.thefnf.net'
+alias hearth-bds='ssh charles@hearth-bds.thefnf.net'
+alias hearth-uds='ssh charles@hearth-uds.thefnf.net'
+
+#####################################################
+#PFV HOSTS #####################################################
+#Bare metal systems (in band access) - Production 
+#Upstairs, production
+alias ausprod-core-ap01='telnet ausprod-core-ap01.turnsys.net'
+alias ausprod-core-sw01='telnet ausprod-core-sw01.turnsys.net'
+
+#alias netbox='ssh -i $PATH_TO_KEY $LABUSER@netbox.dev.thefnf.net' #gns3 with ios/juniper/comware/extreme os/tinycore/openflow (ALL THE NETWORK THINGS)
+#alias cudasys='ssh -i $PATH_TO_KEY $LABUSER@cudasys.dev.thefnf.net' #cuda awesomeness
+
+###########################################################
+#Inband access (ssh/telnet)				  #
+###########################################################
+#alias rr-con-sw4='ssh $RRLABUSER:7003@ausprod.consrv.turnsys.net'
+#alias rr-con-r7='ssh $RRLABUSER:7021@ausprod-consrv.turnsys.net'
+#TBDalias rr-con-r8='ssh $RRLABUSER:7021@ausprod-consrv.turnsys.net'
+#TBDalias rr-con-r10='ssh $RRLABUSER:7021@ausprod-consrv.turnsys.net'
+###########################################################
+
+alias hb='habitctl'
+
+###################################
+#Marp
+###################################
+# Convert slide deck into HTML
+alias marp-html='docker run --rm -v $PWD:/home/marp/app/ -e LANG=$LANG marpteam/marp-cli slide-deck.md'
+# Convert slide deck into PDF (using Chromium in Docker)
+alias marp-pdf='docker run --rm --init -v $PWD:/home/marp/app/ -e LANG=$LANG marpteam/marp-cli slide-deck.md --pdf'
+# Convert slide deck into PPTX (using Chromium in Docker)
+alias marp-pptx='docker run --rm --init -v $PWD:/home/marp/app/ -e LANG=$LANG marpteam/marp-cli slide-deck.md --pptx'
+# Watch mode
+alias marp-watch='docker run --rm --init -v $PWD:/home/marp/app/ -e LANG=$LANG -p 37717:37717 marpteam/marp-cli -w slide-deck.md'
+# Server mode (Serve current directory in http://localhost:8080/)
+alias marp-serve='docker run --rm --init -v $PWD:/home/marp/app -e LANG=$LANG -p 8080:8080 -p 37717:37717 marpteam/marp-cli -s .'
+###################################
+
+alias cloudron='mise exec node@22 -- cloudron login'
\ No newline at end of file