diff --git a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/PreviewContent.tsx b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/PreviewContent.tsx
index 80fb80042..c742826b3 100644
--- a/apps/nextjs/src/components/AppComponents/ComparativeJudgement/PreviewContent.tsx
+++ b/apps/nextjs/src/components/AppComponents/ComparativeJudgement/PreviewContent.tsx
@@ -1,8 +1,5 @@
 import { Box, Flex, Text } from "@radix-ui/themes";
-import type {
-  AnswerAndDistractor,
-  OptionWithPrompt,
-} from "ai-apps/comparative-judgement/state/types";
+import type { OptionWithPrompt } from "ai-apps/comparative-judgement/state/types";
 
 import { sortAlphabetically } from "@/utils/alphabetiseArray";
 
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizRestoreDialog.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizRestoreDialog.tsx
index cdbad249d..f61bfc39e 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizRestoreDialog.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizRestoreDialog.tsx
@@ -1,11 +1,10 @@
-import { Dispatch, useCallback } from "react";
+import type { Dispatch } from "react";
+import { useCallback } from "react";
 
 import * as Sentry from "@sentry/nextjs";
-import {
-  QuizAppAction,
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
-import { QuizAppState } from "ai-apps/quiz-designer/state/types";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
+import type { QuizAppState } from "ai-apps/quiz-designer/state/types";
 
 import { trpc } from "@/utils/trpc";
 
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestionCard.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestionCard.tsx
index 9fdd2f725..5c907490a 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestionCard.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestionCard.tsx
@@ -1,11 +1,10 @@
-import { Dispatch, useState } from "react";
+import type { Dispatch } from "react";
+import { useState } from "react";
 
 import { Flex, Text } from "@radix-ui/themes";
-import {
-  QuizAppAction,
-  QuizAppActions,
-} from "ai-apps/quiz-designer/state/actions";
-import { PotentialQuestionsType } from "hooks/useSuggestedQuestions";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import { QuizAppActions } from "ai-apps/quiz-designer/state/actions";
+import type { PotentialQuestionsType } from "hooks/useSuggestedQuestions";
 
 import { Icon } from "@/components/Icon";
 
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestions.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestions.tsx
index 2145a3097..c1113bd8e 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestions.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/SuggestedQuestions.tsx
@@ -1,9 +1,9 @@
-import { Dispatch } from "react";
+import type { Dispatch } from "react";
 
 import { Box, Flex, Grid, Text } from "@radix-ui/themes";
-import { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
-import { UseGenerationError } from "hooks/useGeneration";
-import { PotentialQuestionsType } from "hooks/useSuggestedQuestions";
+import type { QuizAppAction } from "ai-apps/quiz-designer/state/actions";
+import type { UseGenerationError } from "hooks/useGeneration";
+import type { PotentialQuestionsType } from "hooks/useSuggestedQuestions";
 
 import LoadingWheel from "@/components/LoadingWheel";
 
diff --git a/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationWrapper.tsx b/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationWrapper.tsx
index 7ba0fe6cc..d837683f7 100644
--- a/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationWrapper.tsx
+++ b/apps/nextjs/src/components/AppComponents/common/SingleGeneration/GenerationWrapper.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useState } from "react";
 
-import { GenerationPart } from "@oakai/core/src/types";
+import type { GenerationPart } from "@oakai/core/src/types";
 import { Box } from "@radix-ui/themes";
 
 import GenerationFeedbackDialog, {
diff --git a/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx b/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx
index c84385113..cfe0a4d87 100644
--- a/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx
+++ b/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx
@@ -1,4 +1,4 @@
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import { Box } from "@radix-ui/themes";
 import Link from "next/link";
 
@@ -6,10 +6,8 @@ import useAnalytics from "@/lib/analytics/useAnalytics";
 import { trackDownload } from "@/utils/trackDownload";
 import { trpc } from "@/utils/trpc";
 
-import {
-  ExportsType,
-  getExportsConfig,
-} from "../../ExportsDialogs/exports.helpers";
+import type { ExportsType } from "../../ExportsDialogs/exports.helpers";
+import { getExportsConfig } from "../../ExportsDialogs/exports.helpers";
 import { Icon } from "../../Icon";
 import LoadingWheel from "../../LoadingWheel";
 import LessonIcon from "../../SVGParts/LessonIcon";
diff --git a/apps/nextjs/src/components/AppComponents/download/SectionsNotCompleteDownloadNotice.tsx b/apps/nextjs/src/components/AppComponents/download/SectionsNotCompleteDownloadNotice.tsx
index 5ef0328aa..a0932aa1c 100644
--- a/apps/nextjs/src/components/AppComponents/download/SectionsNotCompleteDownloadNotice.tsx
+++ b/apps/nextjs/src/components/AppComponents/download/SectionsNotCompleteDownloadNotice.tsx
@@ -12,7 +12,7 @@ import {
 
 import AiIcon from "@/components/SVGParts/AiIcon";
 
-import { ProgressSections } from "../Chat/Chat/hooks/useProgressForDownloads";
+import type { ProgressSections } from "../Chat/Chat/hooks/useProgressForDownloads";
 
 const SectionsNotCompleteDownloadNotice = ({
   sections,
diff --git a/apps/nextjs/src/components/ContextProviders/GleapProvider.tsx b/apps/nextjs/src/components/ContextProviders/GleapProvider.tsx
index 733bf91d0..4ff4f790d 100644
--- a/apps/nextjs/src/components/ContextProviders/GleapProvider.tsx
+++ b/apps/nextjs/src/components/ContextProviders/GleapProvider.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import type { PropsWithChildren} from "react";
+import type { PropsWithChildren } from "react";
 import { useEffect } from "react";
 
 import { useAuth, useUser } from "@clerk/nextjs";
diff --git a/apps/nextjs/src/components/DialogControl/ContentOptions/ReportContentDialog.tsx b/apps/nextjs/src/components/DialogControl/ContentOptions/ReportContentDialog.tsx
index 586d65226..9e9106560 100644
--- a/apps/nextjs/src/components/DialogControl/ContentOptions/ReportContentDialog.tsx
+++ b/apps/nextjs/src/components/DialogControl/ContentOptions/ReportContentDialog.tsx
@@ -2,7 +2,7 @@ import { useState } from "react";
 
 import { aiLogger } from "@oakai/logger";
 import { Flex } from "@radix-ui/themes";
-import { Message } from "ai";
+import type { Message } from "ai";
 import { usePosthogFeedbackSurvey } from "hooks/surveys/usePosthogFeedbackSurvey";
 
 import ChatButton from "@/components/AppComponents/Chat/ui/chat-button";
diff --git a/apps/nextjs/src/components/DialogControl/ContentOptions/ShareChatDialog.tsx b/apps/nextjs/src/components/DialogControl/ContentOptions/ShareChatDialog.tsx
index e38f080a7..bf12bd9c0 100644
--- a/apps/nextjs/src/components/DialogControl/ContentOptions/ShareChatDialog.tsx
+++ b/apps/nextjs/src/components/DialogControl/ContentOptions/ShareChatDialog.tsx
@@ -1,10 +1,10 @@
 import { useCallback } from "react";
 
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import { Flex } from "@radix-ui/themes";
 import * as Sentry from "@sentry/react";
 
-import { DialogTypes } from "@/components/AppComponents/Chat/Chat/types";
+import type { DialogTypes } from "@/components/AppComponents/Chat/Chat/types";
 import ChatButton from "@/components/AppComponents/Chat/ui/chat-button";
 import LoadingWheel from "@/components/LoadingWheel";
 import { getLessonTrackingProps } from "@/lib/analytics/helpers";
diff --git a/apps/nextjs/src/components/DialogControl/DialogContents.tsx b/apps/nextjs/src/components/DialogControl/DialogContents.tsx
index 8f148b249..c26db0b2d 100644
--- a/apps/nextjs/src/components/DialogControl/DialogContents.tsx
+++ b/apps/nextjs/src/components/DialogControl/DialogContents.tsx
@@ -1,7 +1,7 @@
-import { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
+import type { LooseLessonPlan } from "@oakai/aila/src/protocol/schema";
 import * as Dialog from "@radix-ui/react-dialog";
 import { Box, Flex } from "@radix-ui/themes";
-import { Message } from "ai";
+import type { Message } from "ai";
 
 import { useDialog } from "../AppComponents/DialogContext";
 import { Icon } from "../Icon";
diff --git a/apps/nextjs/src/components/ExportsDialogs/exports.helpers.ts b/apps/nextjs/src/components/ExportsDialogs/exports.helpers.ts
index feab9db88..3c5c42159 100644
--- a/apps/nextjs/src/components/ExportsDialogs/exports.helpers.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/exports.helpers.ts
@@ -1,4 +1,4 @@
-import { ResourceTypeValueType } from "@/lib/avo/Avo";
+import type { ResourceTypeValueType } from "@/lib/avo/Avo";
 
 export type ExportsType =
   | "lessonSlides"
diff --git a/apps/nextjs/src/components/ExportsDialogs/exports.types.ts b/apps/nextjs/src/components/ExportsDialogs/exports.types.ts
index a0ed0b0d8..b3ba95042 100644
--- a/apps/nextjs/src/components/ExportsDialogs/exports.types.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/exports.types.ts
@@ -1,4 +1,4 @@
-import { LessonDeepPartial } from "@oakai/exports";
+import type { LessonDeepPartial } from "@oakai/exports";
 
 export type ExportsHookProps<T = unknown> = T & {
   onStart: () => void;
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportLessonPlanDoc.ts b/apps/nextjs/src/components/ExportsDialogs/useExportLessonPlanDoc.ts
index 8d3e49a2d..d8ae4ad9c 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportLessonPlanDoc.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportLessonPlanDoc.ts
@@ -1,14 +1,14 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 
 import { exportDocLessonPlanSchema } from "@oakai/exports/browser";
-import { LessonPlanDocInputData } from "@oakai/exports/src/schema/input.schema";
+import type { LessonPlanDocInputData } from "@oakai/exports/src/schema/input.schema";
 import * as Sentry from "@sentry/nextjs";
 import { useDebounce } from "@uidotdev/usehooks";
-import { ZodError } from "zod";
+import type { ZodError } from "zod";
 
 import { trpc } from "@/utils/trpc";
 
-import { ExportsHookProps } from "./exports.types";
+import type { ExportsHookProps } from "./exports.types";
 import { useExportsExistenceCheck } from "./useExportsExistenceCheck";
 
 export function useExportLessonPlanDoc({
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportLessonSlides.ts b/apps/nextjs/src/components/ExportsDialogs/useExportLessonSlides.ts
index f75b10ae8..e43e1d588 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportLessonSlides.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportLessonSlides.ts
@@ -1,14 +1,14 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 
 import { exportSlidesFullLessonSchema } from "@oakai/exports/browser";
-import { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
+import type { LessonSlidesInputData } from "@oakai/exports/src/schema/input.schema";
 import * as Sentry from "@sentry/nextjs";
 import { useDebounce } from "@uidotdev/usehooks";
-import { ZodError } from "zod";
+import type { ZodError } from "zod";
 
 import { trpc } from "@/utils/trpc";
 
-import { ExportsHookProps } from "./exports.types";
+import type { ExportsHookProps } from "./exports.types";
 import { useExportsExistenceCheck } from "./useExportsExistenceCheck";
 
 export function useExportLessonSlides({
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportQuizDesignerSlides.ts b/apps/nextjs/src/components/ExportsDialogs/useExportQuizDesignerSlides.ts
index 2d9783519..c78b0eae4 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportQuizDesignerSlides.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportQuizDesignerSlides.ts
@@ -1,13 +1,11 @@
 import { useEffect, useState } from "react";
 
-import {
-  ExportableQuizAppState,
-  exportableQuizAppStateSchema,
-} from "@oakai/exports/src/schema/input.schema";
+import type { ExportableQuizAppState } from "@oakai/exports/src/schema/input.schema";
+import { exportableQuizAppStateSchema } from "@oakai/exports/src/schema/input.schema";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
 import { useDebounce } from "@uidotdev/usehooks";
-import { ZodError } from "zod";
+import type { ZodError } from "zod";
 
 import { trpc } from "@/utils/trpc";
 
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportQuizDoc.ts b/apps/nextjs/src/components/ExportsDialogs/useExportQuizDoc.ts
index c867e4131..28d2e103b 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportQuizDoc.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportQuizDoc.ts
@@ -1,14 +1,14 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 
 import { exportDocQuizSchema } from "@oakai/exports/browser";
-import { QuizDocInputData } from "@oakai/exports/src/schema/input.schema";
+import type { QuizDocInputData } from "@oakai/exports/src/schema/input.schema";
 import * as Sentry from "@sentry/nextjs";
 import { useDebounce } from "@uidotdev/usehooks";
-import { ZodError } from "zod";
+import type { ZodError } from "zod";
 
 import { trpc } from "@/utils/trpc";
 
-import { ExportsHookProps } from "./exports.types";
+import type { ExportsHookProps } from "./exports.types";
 import { useExportsExistenceCheck } from "./useExportsExistenceCheck";
 
 export function useExportQuizDoc({
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportWorksheetSlides.ts b/apps/nextjs/src/components/ExportsDialogs/useExportWorksheetSlides.ts
index ce83a7d45..1a1ce8056 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportWorksheetSlides.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportWorksheetSlides.ts
@@ -1,14 +1,14 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 
 import { exportSlidesWorksheetSchema } from "@oakai/exports/browser";
-import { WorksheetSlidesInputData } from "@oakai/exports/src/schema/input.schema";
+import type { WorksheetSlidesInputData } from "@oakai/exports/src/schema/input.schema";
 import * as Sentry from "@sentry/nextjs";
 import { useDebounce } from "@uidotdev/usehooks";
-import { ZodError } from "zod";
+import type { ZodError } from "zod";
 
 import { trpc } from "@/utils/trpc";
 
-import { ExportsHookProps } from "./exports.types";
+import type { ExportsHookProps } from "./exports.types";
 import { useExportsExistenceCheck } from "./useExportsExistenceCheck";
 
 export function useExportWorksheetSlides({
diff --git a/apps/nextjs/src/components/Icon/svgs.tsx b/apps/nextjs/src/components/Icon/svgs.tsx
index ffdcc9399..cc17d4485 100644
--- a/apps/nextjs/src/components/Icon/svgs.tsx
+++ b/apps/nextjs/src/components/Icon/svgs.tsx
@@ -71,7 +71,7 @@ import reload from "@/assets/svg/reload.svg";
 import uploadWhite from "@/assets/svg/upload-white.svg";
 import upload from "@/assets/svg/upload.svg";
 
-import { IconName } from "./types";
+import type { IconName } from "./types";
 
 export const svgs: Record<IconName, string> = {
   "arrow-left": arrowLeft,
diff --git a/apps/nextjs/src/middlewares/auth.middleware.ts b/apps/nextjs/src/middlewares/auth.middleware.ts
index c6a1208c6..f67bbb0ba 100644
--- a/apps/nextjs/src/middlewares/auth.middleware.ts
+++ b/apps/nextjs/src/middlewares/auth.middleware.ts
@@ -1,8 +1,5 @@
-import {
-  type ClerkMiddlewareAuth,
-  clerkMiddleware,
-  createRouteMatcher,
-} from "@clerk/nextjs/server";
+import type { ClerkMiddlewareAuth } from "@clerk/nextjs/server";
+import { clerkMiddleware, createRouteMatcher } from "@clerk/nextjs/server";
 import { aiLogger } from "@oakai/logger";
 import type { NextFetchEvent, NextRequest } from "next/server";
 import { NextResponse } from "next/server";