diff --git a/fedora/add-openai-token.sh b/dev/add-openai-token.sh
similarity index 100%
rename from fedora/add-openai-token.sh
rename to dev/add-openai-token.sh
diff --git a/fedora/dev.sh b/dev/fedora/dev.sh
similarity index 100%
rename from fedora/dev.sh
rename to dev/fedora/dev.sh
diff --git a/fedora/install-rails.sh b/dev/fedora/install-rails.sh
similarity index 100%
rename from fedora/install-rails.sh
rename to dev/fedora/install-rails.sh
diff --git a/kitty.sh b/dev/kitty.sh
similarity index 100%
rename from kitty.sh
rename to dev/kitty.sh
diff --git a/nvim-reset.sh b/dev/nvim-reset.sh
similarity index 100%
rename from nvim-reset.sh
rename to dev/nvim-reset.sh
diff --git a/fedora/openai b/dev/openai
similarity index 100%
rename from fedora/openai
rename to dev/openai
diff --git a/repos-linkedag.sh b/dev/repos-linkedag.sh
similarity index 100%
rename from repos-linkedag.sh
rename to dev/repos-linkedag.sh
diff --git a/fedora/save-openai-token.sh b/dev/save-openai-token.sh
similarity index 100%
rename from fedora/save-openai-token.sh
rename to dev/save-openai-token.sh
diff --git a/tmux/tmux.conf b/dev/tmux/tmux.conf
similarity index 100%
rename from tmux/tmux.conf
rename to dev/tmux/tmux.conf
diff --git a/tmux/tmuxConfLoad.sh b/dev/tmux/tmuxConfLoad.sh
similarity index 100%
rename from tmux/tmuxConfLoad.sh
rename to dev/tmux/tmuxConfLoad.sh
diff --git a/tmux/tmuxConfSave.sh b/dev/tmux/tmuxConfSave.sh
similarity index 100%
rename from tmux/tmuxConfSave.sh
rename to dev/tmux/tmuxConfSave.sh
diff --git a/ubuntu/dev.sh b/dev/ubuntu/dev.sh
similarity index 66%
rename from ubuntu/dev.sh
rename to dev/ubuntu/dev.sh
index 2d7cd7b..0715250 100644
--- a/ubuntu/dev.sh
+++ b/dev/ubuntu/dev.sh
@@ -1,10 +1,13 @@
+######################################## nvim
 sudo apt install zig -y
 snap install nvim --classic
+sudo apt install xsel xclip wl-clipboard
+sudo apt install ripgrep -y
 
 sudo cp ../sesh /usr/bin
 cp ../tmux.conf ~/.tmux.conf
 
-###### Node
+######################################## Node
 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
 wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
 nvm install node
@@ -37,11 +40,27 @@ sudo apt install code -y
 
 # sudo gem install solargraph
 
-##### nerd fonts
+######################################## nerd fonts
 sudo apt install wget fontconfig &&
   wget -P ~/.local/share/fonts https://github.com/ryanoasis/nerd-fonts/releases/latest/download/Meslo.zip &&
   cd ~/.local/share/fonts && unzip Meslo.zip && rm *Windows* && rm Meslo.zip && fc-cache -fv
 ######
+######################################## Docker
+# Add Docker's official GPG key:
+sudo apt-get update
+sudo apt-get install ca-certificates curl
+sudo install -m 0755 -d /etc/apt/keyrings
+sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+sudo chmod a+r /etc/apt/keyrings/docker.asc
+
+sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+# Add the repository to Apt sources:
+echo \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+  $(. /etc/os-release && echo "$VERSION_CODENAME") stable" |
+  sudo tee /etc/apt/sources.list.d/docker.list >/dev/null
+sudo apt-get update
+####
 
 npm install -g @railway/cli
 npm install -g vercel
@@ -49,11 +68,10 @@ npm install -g vercel@latest
 
 cd ~/.config/
 
-git clone http://www.git.noisyserver.sbs/noisycarlos/kitty
 git config --global user.email "noisycarlos@hey.com"
 git config --global user.name "Carlos Aldana"
 
-git clone https://git.noisyserver.sbs/noisycarlos/kitty
+git config --global credential.helper store
 git clone https://git.noisyserver.sbs/noisycarlos/nvim
 git clone https://git.noisyserver.sbs/noisycarlos/wezterm
 
diff --git a/fedora/kitty b/fedora/kitty
deleted file mode 160000
index cf1fce5..0000000
--- a/fedora/kitty
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cf1fce59ae352911b30d9dbe39cd7c7fb820d1df
diff --git a/ubuntu/ubuntu-gnome.sd.tar.gz b/ubuntu/ubuntu-gnome.sd.tar.gz
deleted file mode 100644
index d2317c9..0000000
Binary files a/ubuntu/ubuntu-gnome.sd.tar.gz and /dev/null differ
diff --git a/ubuntu/ubuntu.sh b/ubuntu/ubuntu.sh
index 4e56188..eb312cc 100644
--- a/ubuntu/ubuntu.sh
+++ b/ubuntu/ubuntu.sh
@@ -1,19 +1,26 @@
-# sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FEF9748469ADBE15DA7CA80AC2D62742012EA22
+sudo apt install curl -y
+sudo apt install btop -y
+sudo apt-get install fuse libfuse2 -y
+
+# 1Password
 sudo sh -c 'echo "deb [arch=amd64] https://downloads.1password.com/linux/debian/amd64/ stable main" > /etc/apt/sources.list.d/1password.list'
+echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/amd64 stable main' | sudo tee /etc/apt/sources.list.d/1password.list
+sudo mkdir -p /etc/debsig/policies/AC2D62742012EA22/
+curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | sudo tee /etc/debsig/policies/AC2D62742012EA22/1password.pol
+sudo mkdir -p /usr/share/debsig/keyrings/AC2D62742012EA22
+curl -sS https://downloads.1password.com/linux/keys/1password.asc | sudo gpg --dearmor --output /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg
+
 sudo apt update
 sudo apt install 1password -y
 
-sudo apt install btop -y
-sudo apt install curl -y
-sudo apt-get install fuse libfuse2 -y
 # sudo apt install flatseal -y
-
 # sudo apt install gnome-software-plugin-flatpak -y
 # sudo apt install gnome-shell-extension-pop-shell x11-utils -y
+flatpak install flathub com.yubico.yubioath -y
+flatpak install flathub net.nokyan.Resources -y
 
 # Codecs
 sudo apt install ubuntu-restricted-extras -y
-
 # Browsers
 # flatpak install flathub com.google.Chrome -y
 # flatpak install flathub org.waterfoxproject.waterfox -y
diff --git a/vfx/fusion.sh b/vfx/fedora/fusion.sh
similarity index 100%
rename from vfx/fusion.sh
rename to vfx/fedora/fusion.sh
diff --git a/vfx/nuke.sh b/vfx/fedora/nuke.sh
similarity index 100%
rename from vfx/nuke.sh
rename to vfx/fedora/nuke.sh
diff --git a/vfx/resolve.sh b/vfx/fedora/resolve.sh
similarity index 100%
rename from vfx/resolve.sh
rename to vfx/fedora/resolve.sh
diff --git a/vfx/popos/blackmagic.sh b/vfx/popos/blackmagic.sh
new file mode 100644
index 0000000..75626d2
--- /dev/null
+++ b/vfx/popos/blackmagic.sh
@@ -0,0 +1,2 @@
+# sudo apt install libssl3 ocl-icd-opencl-dev fakeroot xorriso
+sudo apt install libapr1 libaprutil1 libxcb-cursor0 libxcb-damage
diff --git a/vfx/popos/nuke.sh b/vfx/popos/nuke.sh
new file mode 100644
index 0000000..3080f7e
--- /dev/null
+++ b/vfx/popos/nuke.sh
@@ -0,0 +1,87 @@
+#!/usr/bin/env bash
+app_name=Nuke
+download_from_source=$1
+version=$2
+
+if [ -z "$version" ]; then
+  version="15.1v3"
+fi
+
+vnum="${version%%v*}"
+installer_path=~/Downloads/Nuke${version}-linux-x86_64.run
+
+base_url=https://public.noisyserver.sbs/vfx-installers
+url=${base_url}/Nuke${version}-linux-x86_64.run
+
+nuke_install_basepath=/usr/bin/Nuke
+installation_dir_name=Nuke${version}
+
+if [ -f "${installer_path}" ]; then
+  download_from_source=s
+  echo "Installer file already exists"
+fi
+# echo "${url} -> ${installer_path}"
+if [ -z "$download_from_source" ]; then
+  read -p "Press Enter to start download of ${app_name} ${version}. If file is already downloaded enter 's', or 'c' to cancel: " download_from_source
+fi
+
+delete_installer=0
+
+case $download_from_source in
+[Ss]*)
+  echo "Skipped download (if the install fails, check that the installer was downloaded properly)"
+  ;;
+[CcNn]*)
+  echo "Installation cancelled"
+  exit 0
+  ;;
+*)
+  echo "Downloading ${app_name} Installer..."
+  curl -# -o ${installer_path}.partial ${url}
+  rm ${installer_path} >>/dev/null
+  mv ${installer_path}.partial ${installer_path}
+  read -p "Download Finished. Press Enter to continue: "
+  delete_installer=1
+  ;;
+esac
+
+sudo chmod +x ${installer_path}
+# sudo ${installer_path}
+
+sudo ${installer_path} --accept-foundry-eula
+
+echo "Moving application to bin directory..."
+if [ ! -d "${nuke_install_basepath}" ]; then
+  sudo mkdir ${nuke_install_basepath} >/dev/null
+fi
+sudo rm -r ${nuke_install_basepath}/${installation_dir_name}
+sudo mv ./${installation_dir_name} ${nuke_install_basepath}/
+curl -sS -# -o ./nuke.png ${base_url}/nuke.png
+sudo mv nuke.png ${nuke_install_basepath}/nuke.png
+
+echo "Installing libraries..."
+sudo yum install mesa-libGLU.x86_64 -y
+sudo dnf install libxcrypt-compat -y
+
+echo "Creating Application shortcut..."
+sudo mkdir -p ~/.local/share/applications/
+sudo chmod -R 777 ~/.local/share/applications/
+cd ~/.local/share/applications/
+echo "#!/usr/bin/env xdg-open
+[Desktop Entry]
+Version=1.0
+Terminal=false
+Type=Application
+Name=Nuke ${version}
+Exec=${nuke_install_basepath}/${installation_dir_name}/Nuke${vnum} --indie
+Icon=${nuke_install_basepath}/nuke.png" >${installation_dir_name}.desktop
+
+echo "Cleanup..."
+if [ "${delete_installer}" = 1 ]; then
+  echo "deleting downloaded installer..."
+  rm ${installer_path}
+  sudo rm -r ./Nuke${version} >>/dev/null
+else
+  echo "leaving previously-existing installer in place..."
+fi
+echo "${app_name} installation script finished"