diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 0e997c0c..5b702e24 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -45,7 +45,6 @@ https://blog.anoff.io/2019-10-migrating-vuetify-1-to-2/
 
 =============== UPGRADING NOTES =================
 
-START HERE - HAPPY MONDAY Working on login page, xs is fucked up
 
 
 ** NOTE: can start dev server, go to *it's* client to see a working older version of ayanova client for comparision!
diff --git a/ayanova/src/components/custom-fields-control.vue b/ayanova/src/components/custom-fields-control.vue
index 7b7fd019..f37fd66b 100644
--- a/ayanova/src/components/custom-fields-control.vue
+++ b/ayanova/src/components/custom-fields-control.vue
@@ -16,7 +16,7 @@
     <div>
       <v-row align-center justify-left row wrap>
         <template v-for="item in this.$store.state.formCustomTemplate[formKey]">
-          <v-col v-if="item.type" :key="item.fld" xs12 sm6 lg4 xl3 px-2>
+          <v-col v-if="item.type" :key="item.fld" cols="12" sm6 lg4 xl3 px-2>
             <div v-if="item.type === 'currency'">
               CURRENCY CONTROL HERE
             </div>
diff --git a/ayanova/src/components/inventorypartassemblytop.vue b/ayanova/src/components/inventorypartassemblytop.vue
index 87b8b9ac..18d0979c 100644
--- a/ayanova/src/components/inventorypartassemblytop.vue
+++ b/ayanova/src/components/inventorypartassemblytop.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-col xs12 md4>
+  <v-col cols="12" md4>
     <v-card class="elevation-5 transparent">
       <v-card-text class="text-center">
         <v-icon x-large color="secondary">fa-heart</v-icon>
diff --git a/ayanova/src/components/inventoryparttop.vue b/ayanova/src/components/inventoryparttop.vue
index e12acd07..f13d90d7 100644
--- a/ayanova/src/components/inventoryparttop.vue
+++ b/ayanova/src/components/inventoryparttop.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-col xs12 md4>
+  <v-col cols="12" md4>
     <v-card class="elevation-5 transparent">
       <v-card-text class="text-center">
         <v-icon x-large color="secondary">fa-cannabis</v-icon>
diff --git a/ayanova/src/components/inventorypotop.vue b/ayanova/src/components/inventorypotop.vue
index a58bcf62..5d6a7ec1 100644
--- a/ayanova/src/components/inventorypotop.vue
+++ b/ayanova/src/components/inventorypotop.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-col xs12 md4>
+  <v-col cols="12">
     <v-card class="elevation-5 transparent">
       <v-card-text class="text-center">
         <v-icon x-large color="secondary">fa-crow</v-icon>
diff --git a/ayanova/src/components/inventorywarehousetop.vue b/ayanova/src/components/inventorywarehousetop.vue
index 97d3933d..e80007df 100644
--- a/ayanova/src/components/inventorywarehousetop.vue
+++ b/ayanova/src/components/inventorywarehousetop.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-col xs12 md4>
+  <v-col cols="12">
     <v-card class="elevation-5 transparent">
       <v-card-text class="text-center">
         <v-icon x-large color="secondary">fa-heart </v-icon>
diff --git a/ayanova/src/components/inventorywidgetlist.vue b/ayanova/src/components/inventorywidgetlist.vue
index bfb28ea8..25df6a5b 100644
--- a/ayanova/src/components/inventorywidgetlist.vue
+++ b/ayanova/src/components/inventorywidgetlist.vue
@@ -1,6 +1,6 @@
 <template>
-  <v-row column wrap class="my-12" align-center v-if="this.formState.ready">
-    <v-col xs12 mt-1 mb-2 v-if="formState.errorBoxMessage">
+  <v-row align-center v-if="this.formState.ready">
+    <v-col cols="12" mt-1 mb-2 v-if="formState.errorBoxMessage">
       <v-alert
         ref="errorbox"
         v-show="formState.errorBoxMessage"
@@ -13,7 +13,7 @@
         >{{ formState.errorBoxMessage }}</v-alert
       >
     </v-col>
-    <v-col xs12 md12>
+    <v-col cols="12">
       <div v-if="this.formState.ready">
         <v-toolbar flat>
           <v-toolbar-title>
diff --git a/ayanova/src/components/underconstruction.vue b/ayanova/src/components/underconstruction.vue
index 725a8612..5c2603ca 100644
--- a/ayanova/src/components/underconstruction.vue
+++ b/ayanova/src/components/underconstruction.vue
@@ -1,7 +1,7 @@
 <template>
   <v-container>
     <v-row>
-      <v-col xs12>
+      <v-col cols="12">
         <v-img :src="require('../assets/underconstruction.svg')"></v-img>
       </v-col>
     </v-row>
diff --git a/ayanova/src/views/About.vue b/ayanova/src/views/About.vue
index 5e4ccecc..ec8cfd04 100644
--- a/ayanova/src/views/About.vue
+++ b/ayanova/src/views/About.vue
@@ -1,6 +1,6 @@
 <template>
   <v-row row v-if="this.formState.ready">
-    <v-col xs12 mt-1 mb-2 v-if="formState.errorBoxMessage">
+    <v-col cols="12" mt-1 mb-2 v-if="formState.errorBoxMessage">
       <v-alert
         ref="errorbox"
         v-show="formState.errorBoxMessage"
diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue
index 92541176..5a9f50fc 100644
--- a/ayanova/src/views/inventory-widget-edit.vue
+++ b/ayanova/src/views/inventory-widget-edit.vue
@@ -3,7 +3,7 @@
     <v-col>
       <v-form ref="form">
         <v-row align-center justify-left row wrap>
-          <v-col xs12 mt-1 mb-2>
+          <v-col cols="12" mt-1 mb-2>
             <v-alert
               ref="errorbox"
               v-show="formState.errorBoxMessage"
@@ -16,7 +16,7 @@
               >{{ formState.errorBoxMessage }}</v-alert
             >
           </v-col>
-          <v-col xs12 sm6 lg4 xl3 px-2>
+          <v-col cols="12" sm6 lg4 xl3 px-2>
             <v-text-field
               v-model="obj.name"
               :readonly="this.formState.readOnly"
@@ -33,7 +33,7 @@
               @change="onChange('name')"
             ></v-text-field>
           </v-col>
-          <v-col xs12 sm6 lg4 xl3 px-2>
+          <v-col cols="12" sm6 lg4 xl3 px-2>
             <v-text-field
               v-model="obj.serial"
               :readonly="this.formState.readOnly"
@@ -47,7 +47,7 @@
               @change="onChange('serial')"
             ></v-text-field>
           </v-col>
-          <v-col xs12 sm6 lg4 xl3 px-2>
+          <v-col cols="12" sm6 lg4 xl3 px-2>
             <v-text-field
               v-model="obj.count"
               :readonly="this.formState.readOnly"
@@ -67,7 +67,7 @@
             ></v-text-field>
           </v-col>
 
-          <v-col xs12 sm6 lg4 xl3 px-2>
+          <v-col cols="12" sm6 lg4 xl3 px-2>
             <v-text-field
               v-model="obj.dollarAmount"
               :readonly="this.formState.readOnly"
@@ -85,7 +85,7 @@
             ></v-text-field>
           </v-col>
 
-          <v-col xs12 sm6 lg4 xl3 px-2>
+          <v-col cols="12" sm6 lg4 xl3 px-2>
             <gz-date-time-picker
               :label="lt('WidgetStartDate')"
               v-model="obj.startDate"
@@ -96,7 +96,7 @@
             ></gz-date-time-picker>
           </v-col>
 
-          <v-col xs12 sm6 lg4 xl3 px-2>
+          <v-col cols="12" sm6 lg4 xl3 px-2>
             <gz-date-time-picker
               :label="lt('WidgetEndDate')"
               :rules="[form().datePrecedence(this, 'startDate', 'endDate')]"
@@ -107,7 +107,7 @@
               @change="onChange('endDate')"
             ></gz-date-time-picker>
           </v-col>
-          <v-col xs12 sm6 lg4 xl3 px-2>
+          <v-col cols="12" sm6 lg4 xl3 px-2>
             <v-checkbox
               v-model="obj.active"
               :readonly="this.formState.readOnly"
@@ -118,7 +118,7 @@
               @change="onChange('active')"
             ></v-checkbox>
           </v-col>
-          <v-col xs12 sm6 lg4 xl3 px-2>
+          <v-col cols="12" sm6 lg4 xl3 px-2>
             <v-select
               v-model="obj.roles"
               :items="pickLists.roles"
@@ -137,7 +137,7 @@
             ></v-select>
           </v-col>
 
-          <v-col xs12 px-2>
+          <v-col cols="12" px-2>
             <v-textarea
               v-model="obj.notes"
               :readonly="this.formState.readOnly"
@@ -149,7 +149,7 @@
             ></v-textarea>
           </v-col>
 
-          <v-col xs12 px-2>
+          <v-col cols="12" px-2>
             <gz-tag-picker
               :label="lt('Tags')"
               v-model="obj.tags"
@@ -160,7 +160,7 @@
             ></gz-tag-picker>
           </v-col>
 
-          <v-col xs12 px-2>
+          <v-col cols="12" px-2>
             <gz-custom-fields
               :formKey="formCustomTemplateKey"
               v-bind:value.sync="obj.customFields"
diff --git a/ayanova/src/views/inventory.vue b/ayanova/src/views/inventory.vue
index 3bb9c855..16638ba1 100644
--- a/ayanova/src/views/inventory.vue
+++ b/ayanova/src/views/inventory.vue
@@ -1,6 +1,6 @@
 <template>
-  <v-row row wrap align-top v-if="this.formState.ready">
-    <v-col xs12 mt-1 mb-2 v-if="formState.errorBoxMessage">
+  <v-row v-if="this.formState.ready">
+    <v-col col="12" mt-1 mb-2 v-if="formState.errorBoxMessage">
       <v-alert
         ref="errorbox"
         v-show="formState.errorBoxMessage"
@@ -18,7 +18,7 @@
     <POTop />
     <PartTop />
     <PartAssemblyTop />
-    <v-col xs12 md4>
+    <v-col cols="12" md4>
       <v-card class="elevation-0 transparent">
         <v-card-text class="text-center">
           <v-icon x-large color="accent">fa-lightbulb</v-icon>
diff --git a/ayanova/src/views/log.vue b/ayanova/src/views/log.vue
index fcf1c23c..5af8a5f5 100644
--- a/ayanova/src/views/log.vue
+++ b/ayanova/src/views/log.vue
@@ -1,6 +1,6 @@
 <template>
   <v-row row v-if="this.formState.ready">
-    <v-col xs12 mt-1 mb-2 v-if="formState.errorBoxMessage">
+    <v-col cols="12" mt-1 mb-2 v-if="formState.errorBoxMessage">
       <v-alert
         ref="errorbox"
         v-show="formState.errorBoxMessage"
diff --git a/ayanova/src/views/notfound.vue b/ayanova/src/views/notfound.vue
index 5abdb0e3..ff8904a4 100644
--- a/ayanova/src/views/notfound.vue
+++ b/ayanova/src/views/notfound.vue
@@ -1,7 +1,7 @@
 <template>
   <v-container>
     <v-row justify-center>
-      <v-col xs12>
+      <v-col cols="12">
         <div class="text-center">
           <v-icon color="red" size="100">fa-dragon</v-icon>
           <div class="headline">