Theme updated

Updated all functions