diff --git a/auth.config.ts b/auth.config.ts
index ad196c0c8e..e2d591c080 100644
--- a/auth.config.ts
+++ b/auth.config.ts
@@ -12,37 +12,7 @@ export const authConfig = {
     signIn: "/sign-in",
     newUser: "/sign-up",
   },
-  callbacks: {
-    authorized({ auth, request: { nextUrl } }) {
-      const isLoggedIn = !!auth?.user;
-      const isOnDashboard = nextUrl.pathname.startsWith("/");
-      const isSignUpPage = nextUrl.pathname === "/sign-up";
 
-      // Allow access to sign-up page
-      if (isSignUpPage) return true;
-
-      if (isOnDashboard) {
-        if (isLoggedIn) return true;
-        return false; // Redirect users who are not logged in to the login page
-      } else if (isLoggedIn) {
-        return Response.redirect(new URL("/", nextUrl));
-      }
-      return true;
-    },
-
-    jwt({ token, user }) {
-      if (user) {
-        token.data = user;
-      }
-      return token;
-    },
-
-    session({ session, token }) {
-      session.user = token.data as any;
-      console.log("session", session);
-      return session;
-    },
-  },
   providers: [
     Credentials({
       name: "credentials",
@@ -68,6 +38,51 @@ export const authConfig = {
       },
     }),
   ],
+  callbacks: {
+    authorized({ auth, request: { nextUrl } }) {
+      const isLoggedIn = !!auth?.user;
+      const isOnDashboard = nextUrl.pathname.startsWith("/");
+      const isSignUpPage = nextUrl.pathname === "/sign-up";
+
+      // Allow access to sign-up page
+      if (isSignUpPage) return true;
+
+      if (isOnDashboard) {
+        if (isLoggedIn) return true;
+        return false; // Redirect users who are not logged in to the login page
+      } else if (isLoggedIn) {
+        return Response.redirect(new URL("/", nextUrl));
+      }
+      return true;
+    },
+
+    jwt: async ({ token, user, account }) => {
+      // console.log(`In jwt callback - Token is ${JSON.stringify(token)}`);
+      if (user && account) {
+        // console.log(`In jwt callback - User is ${JSON.stringify(user)}`);
+        // console.log(`In jwt callback - Account is ${JSON.stringify(account)}`);
+        // token.data = user;
+        return {
+          ...token,
+          accessToken: user.accessToken,
+          refreshToken: user.refreshToken,
+          user,
+        };
+      }
+      return token;
+    },
+
+    session: async ({ session, token }) => {
+      console.log(`In session callback - Token is ${JSON.stringify(token)}`);
+      // session.user = token.data as any;
+      if (token) {
+        session.accessToken = token.accessToken;
+        session.refreshToken = token.refreshToken;
+      }
+      // console.log("session", session);
+      return session;
+    },
+  },
 } satisfies NextAuthConfig;
 
 export const { signIn, signOut, auth, handlers } = NextAuth(authConfig);
diff --git a/tailwind.config.js b/tailwind.config.js
index 6d2ff06563..f1a4b38db2 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -41,6 +41,9 @@ module.exports = {
             yellow: "#ffdf16",
           },
           dark: {
+            DEFAULT: "#0E1117",
+            700: "#151B23",
+            400: "#262C36",
             title: "#E2E8F0",
             text: "#94a3b8" /* primary default for dark mode */,
           },