Updated to latest version of script and themes