Added HTC and switched to Regular and Nightly