Add New Hterm and remove legacy hterm