Rewrite HTC variant
Update version
More tweaks for HTC
Use appropriate icons on sense 5/6