Bring back inline with Chad's trees, long overdue -
HW, UI, Audio, BT changes