So the kali post installer is up and you can git clone it and let's work on this together, still working on tweak my Kali so don't mind the option 2 just yet! Open terminal and type
git clone https://github.com/darkspellx/Kali- /opt/Kali-
cd /opt/Kali-
./postkali.sh