diff --git a/config/base16-themes b/config/base16-themes
deleted file mode 100644
index 5b2fccc..0000000
--- a/config/base16-themes
+++ /dev/null
@@ -1,251 +0,0 @@
-3024
-apathy
-apprentice
-ashes
-atelier-cave-light
-atelier-cave
-atelier-dune-light
-atelier-dune
-atelier-estuary-light
-atelier-estuary
-atelier-forest-light
-atelier-forest
-atelier-heath-light
-atelier-heath
-atelier-lakeside-light
-atelier-lakeside
-atelier-plateau-light
-atelier-plateau
-atelier-savanna-light
-atelier-savanna
-atelier-seaside-light
-atelier-seaside
-atelier-sulphurpool-light
-atelier-sulphurpool
-atlas
-ayu-dark
-ayu-light
-ayu-mirage
-bespin
-black-metal-bathory
-black-metal-burzum
-black-metal-dark-funeral
-black-metal-gorgoroth
-black-metal-immortal
-black-metal-khold
-black-metal-marduk
-black-metal-mayhem
-black-metal-nile
-black-metal-venom
-black-metal
-blueforest
-blueish
-brewer
-bright
-brogrammer
-brushtrees-dark
-brushtrees
-caroline
-catppuccin-frappe
-catppuccin-latte
-catppuccin-macchiato
-catppuccin-mocha
-chalk
-circus
-classic-dark
-classic-light
-codeschool
-colors
-cupcake
-cupertino
-da-one-black
-da-one-gray
-da-one-ocean
-da-one-paper
-da-one-sea
-da-one-white
-danqing-light
-danqing
-darcula
-darkmoss
-darktooth
-darkviolet
-decaf
-default-dark
-default-light
-dirtysea
-dracula
-edge-dark
-edge-light
-eighties
-embers
-emil
-equilibrium-dark
-equilibrium-gray-dark
-equilibrium-gray-light
-equilibrium-light
-eris
-espresso
-eva-dim
-eva
-evenok-dark
-everforest-dark-hard
-everforest
-flat
-framer
-fruit-soda
-gigavolt
-github
-google-dark
-google-light
-gotham
-grayscale-dark
-grayscale-light
-greenscreen
-gruber
-gruvbox-dark-hard
-gruvbox-dark-medium
-gruvbox-dark-pale
-gruvbox-dark-soft
-gruvbox-light-hard
-gruvbox-light-medium
-gruvbox-light-soft
-gruvbox-material-dark-hard
-gruvbox-material-dark-medium
-gruvbox-material-dark-soft
-gruvbox-material-light-hard
-gruvbox-material-light-medium
-gruvbox-material-light-soft
-hardcore
-harmonic16-dark
-harmonic16-light
-heetch-light
-heetch
-helios
-hopscotch
-horizon-dark
-horizon-light
-horizon-terminal-dark
-horizon-terminal-light
-humanoid-dark
-humanoid-light
-ia-dark
-ia-light
-icy
-irblack
-isotope
-kanagawa
-katy
-kimber
-lime
-macintosh
-marrakesh
-materia
-material-darker
-material-lighter
-material-palenight
-material-vivid
-material
-mellow-purple
-mexico-light
-mocha
-monokai
-mountain
-nebula
-nord
-nova
-ocean
-oceanicnext
-one-light
-onedark
-outrun-dark
-oxocarbon-dark
-oxocarbon-light
-pandora
-papercolor-dark
-papercolor-light
-paraiso
-pasque
-phd
-pico
-pinky
-pop
-porple
-primer-dark-dimmed
-primer-dark
-primer-light
-purpledream
-qualia
-railscasts
-rebecca
-rose-pine-dawn
-rose-pine-moon
-rose-pine
-sagelight
-sakura
-sandcastle
-selenized-black
-selenized-dark
-selenized-light
-selenized-white
-seti
-shades-of-purple
-shadesmear-dark
-shadesmear-light
-shapeshifter
-silk-dark
-silk-light
-snazzy
-solarflare-light
-solarflare
-solarized-dark
-solarized-light
-spaceduck
-spacemacs
-standardized-dark
-standardized-light
-stella
-still-alive
-summercamp
-summerfruit-dark
-summerfruit-light
-synth-midnight-dark
-synth-midnight-light
-tango
-tarot
-tender
-tokyo-city-dark
-tokyo-city-light
-tokyo-city-terminal-dark
-tokyo-city-terminal-light
-tokyo-night-dark
-tokyo-night-light
-tokyo-night-storm
-tokyo-night-terminal-dark
-tokyo-night-terminal-light
-tokyo-night-terminal-storm
-tokyodark-terminal
-tokyodark
-tomorrow-night-eighties
-tomorrow-night
-tomorrow
-tube
-twilight
-unikitty-dark
-unikitty-light
-unikitty-reversible
-uwunicorn
-vice
-vulcan
-windows-10-light
-windows-10
-windows-95-light
-windows-95
-windows-highcontrast-light
-windows-highcontrast
-windows-nt-light
-windows-nt
-woodland
-xcode-dusk
-zenbones
-zenburn
diff --git a/config/waybar.nix b/config/waybar.nix
index e0f174c..e8f8824 100644
--- a/config/waybar.nix
+++ b/config/waybar.nix
@@ -31,7 +31,6 @@ with lib;
         ];
         modules-right = [
           "custom/hyprbindings"
-          "custom/themeselector"
           "custom/notification"
           "custom/exit"
           "battery"
@@ -113,11 +112,6 @@ with lib;
           };
           on-click = "sleep 0.1 && pavucontrol";
         };
-        "custom/themeselector" = {
-          tooltip = false;
-          format = "";
-          on-click = "sleep 0.1 && theme-selector";
-        };
         "custom/exit" = {
           tooltip = false;
           format = "";
@@ -259,7 +253,7 @@ with lib;
           padding: 0px 30px 0px 15px;
           border-radius: 0px 0px 40px 0px;
         }
-        #custom-hyprbindings, #network, #custom-themeselector, #battery,
+        #custom-hyprbindings, #network, #battery,
         #custom-notification, #tray, #custom-exit {
           font-weight: bold;
           background: #${config.stylix.base16Scheme.base0F};
diff --git a/hosts/familypc/home.nix b/hosts/familypc/home.nix
index 480abd5..0b08e53 100644
--- a/hosts/familypc/home.nix
+++ b/hosts/familypc/home.nix
@@ -45,7 +45,6 @@ in
     recursive = true;
   };
   home.file.".config/ascii-neofetch".source = ../../config/ascii-neofetch;
-  home.file.".base16-themes".source = ../../config/base16-themes;
   home.file.".face.icon".source = ../../config/face.jpg;
   home.file.".config/face.jpg".source = ../../config/face.jpg;
   home.file.".config/neofetch/config.conf".text = ''
@@ -126,12 +125,6 @@ in
     (import ../../scripts/emopicker9000.nix { inherit pkgs; })
     (import ../../scripts/task-waybar.nix { inherit pkgs; })
     (import ../../scripts/squirtle.nix { inherit pkgs; })
-    (import ../../scripts/themechange.nix {
-      inherit pkgs;
-      inherit host;
-      inherit username;
-    })
-    (import ../../scripts/theme-selector.nix { inherit pkgs; })
     (import ../../scripts/nvidia-offload.nix { inherit pkgs; })
     (import ../../scripts/wallsetter.nix {
       inherit pkgs;
diff --git a/scripts/theme-selector.nix b/scripts/theme-selector.nix
deleted file mode 100644
index a1ea26f..0000000
--- a/scripts/theme-selector.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs }:
-
-pkgs.writeShellScriptBin "theme-selector" ''
-  # Get user selection for new theme from base16-themes file
-  chosen=$(cat $HOME/.base16-themes | ${pkgs.rofi-wayland}/bin/rofi -i -dmenu)
-
-  # Exit if none chosen.
-  [ -z "$chosen" ] && exit
-
-  ${pkgs.libnotify}/bin/notify-send "$chosen is building please wait" &
-  themechange "$chosen"
-''
diff --git a/scripts/themechange.nix b/scripts/themechange.nix
deleted file mode 100644
index fa97ff2..0000000
--- a/scripts/themechange.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  pkgs,
-  host,
-  username,
-  ...
-}:
-
-pkgs.writeShellScriptBin "themechange" ''
-  if [[ ! $@ ]];then
-    echo "No Theme Given"
-  else
-    replacement="$1"
-    sed -i "/^\s*theme[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$replacement\"/" /home/${username}/zaneyos/hosts/${host}/variables.nix
-    kitty -e pkexec nixos-rebuild switch --flake /home/${username}/zaneyos
-  fi
-''