Updated to use the new more independent JS includes.