diff --git a/components/swap/SwapForm.tsx b/components/swap/SwapForm.tsx
index 3af0ef80..9c537a23 100644
--- a/components/swap/SwapForm.tsx
+++ b/components/swap/SwapForm.tsx
@@ -101,12 +101,18 @@ const SwapForm = () => {
   const setAmountInFormValue = useCallback((amountIn: string) => {
     set((s) => {
       s.swap.amountIn = amountIn
+      if (!parseFloat(amountIn)) {
+        s.swap.amountOut = ''
+      }
     })
   }, [])
 
   const setAmountOutFormValue = useCallback((amountOut: string) => {
     set((s) => {
       s.swap.amountOut = amountOut
+      if (!parseFloat(amountOut)) {
+        s.swap.amountIn = ''
+      }
     })
   }, [])
 
diff --git a/pages/_app.tsx b/pages/_app.tsx
index ef21e066..ad67509c 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -63,7 +63,7 @@ function MyApp({ Component, pageProps }: AppProps) {
         <ConnectionProvider endpoint={endpoint}>
           <WalletProvider wallets={wallets} onError={onError}>
             <EnhancedWalletProvider>
-              <ThemeProvider defaultTheme="Dark">
+              <ThemeProvider defaultTheme="Mango Classic">
                 <ViewportProvider>
                   <Layout>
                     <Component {...pageProps} />