diff --git a/theme/components.ts b/theme/components.ts
index fbb720fe..a331a39e 100644
--- a/theme/components.ts
+++ b/theme/components.ts
@@ -65,8 +65,43 @@ export const components = {
     },
   },
   Input: {
-    baseStyle: {
-      field: {
+    defaultProps: {
+      variant: 'outline',
+    },
+    variants: {
+      outline: {
+        field: {
+          border: '1px solid',
+          borderColor: 'outline',
+          borderRadius: '10px',
+          fontSize: '13px',
+          fontWeight: 400,
+          lineHeight: '15.73px',
+          fontFamily: 'body',
+          _placeholder: {
+            color: 'text.subtitle',
+          },
+          _hover: {
+            borderColor: 'outline',
+          },
+          _focus: {
+            borderColor: 'primaryBlue.300',
+            boxShadow: '0 0 0 1px primaryBlue.300',
+          },
+          _active: {
+            borderColor: 'primaryBlue.300',
+            boxShadow: '0 0 0 1px primaryBlue.300',
+          },
+        },
+      },
+    },
+  },
+  Textarea: {
+    defaultProps: {
+      variant: 'outline',
+    },
+    variants: {
+      outline: {
         border: '1px solid',
         borderColor: 'outline',
         borderRadius: '10px',
@@ -91,31 +126,6 @@ export const components = {
       },
     },
   },
-  Textarea: {
-    baseStyle: {
-      border: '1px solid',
-      borderColor: 'outline',
-      borderRadius: '10px',
-      fontSize: '13px',
-      fontWeight: 400,
-      lineHeight: '15.73px',
-      fontFamily: 'body',
-      _placeholder: {
-        color: 'text.subtitle',
-      },
-      _hover: {
-        borderColor: 'outline',
-      },
-      _focus: {
-        borderColor: 'primaryBlue.300',
-        boxShadow: '0 0 0 1px primaryBlue.300',
-      },
-      _active: {
-        borderColor: 'primaryBlue.300',
-        boxShadow: '0 0 0 1px primaryBlue.300',
-      },
-    },
-  },
   Tooltip: {
     baseStyle: {
       bg: 'white',
diff --git a/utils/getCalendarStyles.ts b/utils/getCalendarStyles.ts
index 36fcad7c..73693519 100644
--- a/utils/getCalendarStyles.ts
+++ b/utils/getCalendarStyles.ts
@@ -7,22 +7,12 @@ export const getCalendarStyles = (theme: CustomTheme) => css`
     background-color: transparent;
     margin: 0 !important;
   }
-  .fc th {
-    text-transform: uppercase;
-    font-weight: ${theme.fontWeights[600]};
-  }
   .fc-day-today {
     background-color: inherit !important;
   }
   .fc-weekend {
     background-color: rgba(0, 0, 0, 0.05) !important;
   }
-  .fc-event-title {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    font-size: ${theme.fontSizes.sm};
-    font-weight: ${theme.fontWeights[400]};
-  }
   .fc .fc-daygrid-day {
     padding: 8px 5px !important;
   }
@@ -40,7 +30,7 @@ export const getCalendarStyles = (theme: CustomTheme) => css`
     padding: 0 !important;
   }
   .fc-daygrid-day-events:not(:empty) {
-    margin-bottom: 65px !important;
+    margin-bottom: 30px !important;
   }
   .fc-daygrid-event-harness {
     margin-top: 4px !important;
@@ -48,4 +38,20 @@ export const getCalendarStyles = (theme: CustomTheme) => css`
   .fc-daygrid-event-harness:first-of-type {
     margin-top: 0 !important;
   }
+  .fc .fc-scrollgrid thead .fc-col-header-cell {
+    border-left: none !important;
+    border-right: none !important;
+  }
+  .fc .fc-col-header-cell {
+    height: 32px;
+  }
+  .fc .fc-col-header-cell .fc-scrollgrid-sync-inner {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-weight: ${theme.fontWeights[600]};
+    text-transform: uppercase;
+    font-size: 14px;
+  }
 `;