diff --git a/ayanova/src/api/gzutil.js b/ayanova/src/api/gzutil.js
index acf66bf1..6661cd85 100644
--- a/ayanova/src/api/gzutil.js
+++ b/ayanova/src/api/gzutil.js
@@ -464,6 +464,7 @@ export default {
       case window.$gz.type.WorkOrderItemScheduledUser:
         return "$ayiUserClock";
       case window.$gz.type.WorkOrderItemTask:
+      case window.$gz.type.TaskGroup:
         return "$ayiTasks";
       case window.$gz.type.WorkOrderItemTravel:
         return "$ayiTruckMonster";
diff --git a/ayanova/src/views/svc-task-group.vue b/ayanova/src/views/svc-task-group.vue
index 0a48eec2..75310ad7 100644
--- a/ayanova/src/views/svc-task-group.vue
+++ b/ayanova/src/views/svc-task-group.vue
@@ -9,7 +9,7 @@
             <v-text-field
               v-model="obj.name"
               :readonly="formState.readOnly"
-              :label="$ay.t('WorkOrderItemStatusName')"
+              :label="$ay.t('TaskGroupName')"
               :rules="[form().required(this, 'name')]"
               :error-messages="form().serverErrors(this, 'name')"
               ref="name"
@@ -18,20 +18,6 @@
             ></v-text-field>
           </v-col>
 
-          <v-col cols="12" sm="6" lg="4" xl="3">
-            <span class="text-caption">
-              {{ $ay.t("WorkOrderItemStatusColor") }}
-            </span>
-            <v-color-picker
-              v-model="obj.color"
-              :readonly="formState.readOnly"
-              hide-mode-switch
-              mode="hexa"
-              :error-messages="form().serverErrors(this, 'color')"
-              ref="color"
-              @input="fieldValueChanged('color')"
-            ></v-color-picker>
-          </v-col>
           <v-col cols="12" sm="6" lg="4" xl="3">
             <v-checkbox
               v-model="obj.active"
@@ -45,14 +31,11 @@
           </v-col>
 
           <!------------------------------------->
-          <v-col
-            v-if="form().showMe(this, 'WorkOrderItemStatusNotes')"
-            cols="12"
-          >
+          <v-col cols="12">
             <v-textarea
               v-model="obj.notes"
               :readonly="formState.readOnly"
-              :label="$ay.t('WorkOrderItemStatusNotes')"
+              :label="$ay.t('TaskGroupNotes')"
               :error-messages="form().serverErrors(this, 'notes')"
               ref="notes"
               data-cy="notes"
@@ -79,9 +62,9 @@
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
-const FORM_KEY = "svc-work-order-item-status-edit";
-const API_BASE_URL = "work-order-item-status/";
-const FORM_CUSTOM_TEMPLATE_KEY = "WorkOrderItemStatus"; //<-- Should always be CoreBizObject AyaType name here where possible
+const FORM_KEY = "svc-task-group-edit";
+const API_BASE_URL = "task-group/";
+//const FORM_CUSTOM_TEMPLATE_KEY = "svc-task-group"; //<-- Should always be CoreBizObject AyaType name here where possible
 
 export default {
   async created() {
@@ -144,14 +127,14 @@ export default {
   },
   data() {
     return {
-      formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
+      //formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
       obj: {
         id: 0,
         concurrency: 0,
         name: null,
         active: true,
         notes: null,
-        color: "#ffffff" //if no previously set value then control will respond with a big object with all color system values in place, this prevents that
+        items: []
       },
       formState: {
         ready: false,
@@ -164,7 +147,7 @@ export default {
         serverError: {}
       },
       rights: window.$gz.role.defaultRightsObject(),
-      ayaType: window.$gz.type.WorkOrderItemStatus
+      ayaType: window.$gz.type.TaskGroup
     };
   },
   //WATCHERS
@@ -297,7 +280,7 @@ export default {
             //NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
 
             this.$router.push({
-              name: "svc-work-order-status-edit",
+              name: "svc-task-group",
               params: {
                 recordid: res.data.id,
                 obj: res.data // Pass data object to new form
@@ -390,7 +373,7 @@ async function clickHandler(menuItem) {
         break;
       case "list":
         m.vm.$router.push({
-          name: "svc-work-order-item-status"
+          name: "svc-task-groups"
         });
         break;
       default:
@@ -409,13 +392,13 @@ function generateMenu(vm) {
   let menuOptions = {
     isMain: false,
     readOnly: vm.formState.readOnly,
-    icon: "$ayiCircle",
-    title: "WorkOrderItemStatus",
-    helpUrl: "svc-work-order-item-status",
+    icon: "$ayiTasks",
+    title: "TaskGroup",
+    helpUrl: "svc-task-groups",
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemStatus,
+      ayaType: window.$gz.type.TaskGroup,
       recordId: vm.$route.params.recordid,
-      formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
+      //formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
       recordName: vm.obj.name
     },
     menuItems: []
@@ -448,8 +431,8 @@ function generateMenu(vm) {
   menuOptions.menuItems.push({ divider: true, inset: false });
 
   menuOptions.menuItems.push({
-    title: "WorkOrderItemStatusList",
-    icon: "$ayiCircle",
+    title: "TaskGroupList",
+    icon: "$ayiTasks",
     key: FORM_KEY + ":list",
     vm: vm
   });
@@ -466,7 +449,7 @@ let JUST_DELETED = false;
 //
 async function initForm(vm) {
   await fetchTranslatedText();
-  await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
+  //await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
 }
 
 //////////////////////////////////////////////////////////
@@ -475,10 +458,9 @@ async function initForm(vm) {
 //
 async function fetchTranslatedText() {
   await window.$gz.translation.cacheTranslations([
-    "WorkOrderItemStatus",
-    "WorkOrderItemStatusName",
-    "WorkOrderItemStatusColor",
-    "WorkOrderItemStatusNotes"
+    "TaskGroupName",
+    "TaskGroupNotes",
+    "Task"
   ]);
 }
 </script>
diff --git a/ayanova/src/views/svc-task-groups.vue b/ayanova/src/views/svc-task-groups.vue
index e77c9f3d..81e2f75f 100644
--- a/ayanova/src/views/svc-task-groups.vue
+++ b/ayanova/src/views/svc-task-groups.vue
@@ -2,31 +2,29 @@
   <div>
     <gz-report-selector ref="reportSelector"></gz-report-selector>
     <gz-extensions
-      :aya-type="$ay.ayt().WorkOrderItemStatus"
+      :aya-type="$ay.ayt().TaskGroup"
       :selected-items="selectedItems"
       ref="extensions"
     >
     </gz-extensions>
     <gz-data-table
       ref="gzdatatable"
-      form-key="svc-work-order-item-status"
-      data-list-key="WorkOrderItemStatusDataList"
+      form-key="svc-task-group"
+      data-list-key="TaskGroupDataList"
       :show-select="rights.read"
       :reload="reload"
       @selection-change="handleSelected"
-      data-cy="woItemStatusTable"
+      data-cy="taskGroupTable"
     >
     </gz-data-table>
   </div>
 </template>
 
 <script>
-const FORM_KEY = "svc-work-order-item-status";
+const FORM_KEY = "svc-task-group";
 export default {
   created() {
-    this.rights = window.$gz.role.getRights(
-      window.$gz.type.WorkOrderItemStatus
-    );
+    this.rights = window.$gz.role.getRights(window.$gz.type.TaskGroup);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     generateMenu(this);
   },
@@ -59,7 +57,7 @@ async function clickHandler(menuItem) {
     switch (m.key) {
       case "new":
         m.vm.$router.push({
-          name: "svc-work-order-item-status-edit",
+          name: "svc-task-group",
           params: { recordid: 0 }
         });
         break;
@@ -89,12 +87,12 @@ async function clickHandler(menuItem) {
 function generateMenu(vm) {
   let menuOptions = {
     isMain: true,
-    icon: "$ayiCircle",
-    title: "WorkOrderItemStatusList",
-    helpUrl: "svc-work-order-item-status",
+    icon: "$ayiTasks",
+    title: "TaskGroupList",
+    helpUrl: "svc-task-groups",
     menuItems: [],
     formData: {
-      ayaType: window.$gz.type.WorkOrderItemStatus
+      ayaType: window.$gz.type.TaskGroup
     }
   };
 
diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue
index df514861..5319c74b 100644
--- a/ayanova/src/views/svc-workorder.vue
+++ b/ayanova/src/views/svc-workorder.vue
@@ -1462,6 +1462,7 @@ async function fetchTranslatedText(vm) {
     "WorkOrderItemTaskCompletedDate",
     "WorkOrderItemTasks",
     "TaskGroup",
+    "TaskGroupList",
     "SaveRecordToProceed",
     "Cost",
     "ListPrice",