Kali: Added some settings & tweaks