ADD: define subcategories in ts constants
CHG: reorder ts constants