diff --git a/frontend/src/ui/components/AlertContent.tsx b/frontend/src/ui/components/AlertContent.tsx
index 2f6f6af..e49895e 100644
--- a/frontend/src/ui/components/AlertContent.tsx
+++ b/frontend/src/ui/components/AlertContent.tsx
@@ -38,7 +38,9 @@ function AlertContent({
   const { t } = useTranslation();
 
   return (
-    <AlertDialogPrimitive.Portal>
+    <AlertDialogPrimitive.Portal
+      container={document.getElementById('app-container')}
+    >
       <AlertOverlay />
       <AlertContainer variation={variation ?? 'default'}>
         {title && (
diff --git a/frontend/src/ui/theme/alert.ts b/frontend/src/ui/theme/alert.ts
index 75748d0..06dc8ac 100644
--- a/frontend/src/ui/theme/alert.ts
+++ b/frontend/src/ui/theme/alert.ts
@@ -1,6 +1,6 @@
 import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog';
 import { keyframes } from '@stitches/react';
-import { styled } from './theme';
+import { lightMode, styled } from './theme';
 
 export const Alert = AlertDialogPrimitive.Root;
 export const AlertTrigger = AlertDialogPrimitive.Trigger;
@@ -24,6 +24,9 @@ export const AlertOverlay = styled(AlertDialogPrimitive.Overlay, {
   '@media (prefers-reduced-motion: no-preference)': {
     animation: `${overlayShow()} 150ms cubic-bezier(0.16, 1, 0.3, 1)`,
   },
+  [`.${lightMode} &`]: {
+    backgroundColor: '$blackA8',
+  },
 });
 
 export const AlertContainer = styled(AlertDialogPrimitive.Content, {
diff --git a/frontend/src/ui/theme/forms.ts b/frontend/src/ui/theme/forms.ts
index 0007a0b..9dd6588 100644
--- a/frontend/src/ui/theme/forms.ts
+++ b/frontend/src/ui/theme/forms.ts
@@ -1,7 +1,7 @@
 import * as UnstyledLabel from '@radix-ui/react-label';
 import * as CheckboxPrimitive from '@radix-ui/react-checkbox';
 import * as ToggleGroup from '@radix-ui/react-toggle-group';
-import { styled, theme } from './theme';
+import { lightMode, styled, theme } from './theme';
 import ControlledInput from '../components/forms/ControlledInput';
 import PasswordField from '../components/forms/PasswordField';
 
@@ -76,6 +76,12 @@ const inputStyles = {
       },
     },
   },
+  [`.${lightMode} &`]: {
+    border: '1px solid $gray7',
+    '&:disabled': {
+      borderColor: '$gray4',
+    },
+  },
 } as const;
 
 export const InputBox = styled('input', inputStyles);
@@ -105,6 +111,11 @@ export const Textarea = styled('textarea', {
   '&:invalid': {
     borderColor: '$red5',
   },
+  [`.${lightMode} &`]: {
+    '&:disabled': {
+      borderColor: '$gray4',
+    },
+  },
   variants: {
     border: {
       none: {
@@ -123,6 +134,35 @@ export const MultiButton = styled('div', {
   display: 'flex',
 });
 
+function buttonStyle(hueName: string) {
+  return {
+    border: `1px solid $${hueName}6`,
+    backgroundColor: `$${hueName}4`,
+    '&:not(:disabled)': {
+      '&:hover': {
+        backgroundColor: `$${hueName}5`,
+        borderColor: `$${hueName}8`,
+      },
+      '&:active': {
+        background: `$${hueName}6`,
+      },
+    },
+    [`.${lightMode} &`]: {
+      border: `1px solid $${hueName}10`,
+      backgroundColor: `$${hueName}10`,
+      color: `$${hueName}2`,
+      '&:not(:disabled)': {
+        '&:hover': {
+          backgroundColor: `$${hueName}11`,
+        },
+        '&:active': {
+          background: `$${hueName}11`,
+        },
+      },
+    },
+  };
+}
+
 const button = {
   all: 'unset',
   cursor: 'pointer',
@@ -151,6 +191,15 @@ const button = {
     backgroundColor: '$gray3',
     cursor: 'not-allowed',
   },
+  [`.${lightMode} &`]: {
+    backgroundColor: '$gray2',
+    border: '1px solid $gray7',
+    '&:disabled': {
+      border: '1px solid $gray4',
+      backgroundColor: '$gray3',
+      cursor: 'not-allowed',
+    },
+  },
   transition: 'all 0.2s',
   variants: {
     border: {
@@ -194,71 +243,11 @@ const button = {
       },
     },
     variation: {
-      primary: {
-        border: '1px solid $teal6',
-        backgroundColor: '$teal4',
-        '&:not(:disabled)': {
-          '&:hover': {
-            backgroundColor: '$teal5',
-            borderColor: '$teal8',
-          },
-          '&:active': {
-            background: '$teal6',
-          },
-        },
-      },
-      success: {
-        border: '1px solid $grass6',
-        backgroundColor: '$grass4',
-        '&:not(:disabled)': {
-          '&:hover': {
-            backgroundColor: '$grass5',
-            borderColor: '$grass8',
-          },
-          '&:active': {
-            background: '$grass6',
-          },
-        },
-      },
-      error: {
-        border: '1px solid $red6',
-        backgroundColor: '$red4',
-        '&:not(:disabled)': {
-          '&:hover': {
-            backgroundColor: '$red5',
-            borderColor: '$red8',
-          },
-          '&:active': {
-            background: '$red6',
-          },
-        },
-      },
-      warning: {
-        border: '1px solid $yellow6',
-        backgroundColor: '$yellow4',
-        '&:not(:disabled)': {
-          '&:hover': {
-            backgroundColor: '$yellow5',
-            borderColor: '$yellow8',
-          },
-          '&:active': {
-            background: '$yellow6',
-          },
-        },
-      },
-      danger: {
-        border: '1px solid $red6',
-        backgroundColor: '$red4',
-        '&:not(:disabled)': {
-          '&:hover': {
-            backgroundColor: '$red5',
-            borderColor: '$red8',
-          },
-          '&:active': {
-            background: '$red6',
-          },
-        },
-      },
+      primary: buttonStyle('teal'),
+      success: buttonStyle('grass'),
+      error: buttonStyle('red'),
+      warning: buttonStyle('yellow'),
+      danger: buttonStyle('red'),
     },
   },
 } as const;