diff --git a/frontend/src/queries/students.ts b/frontend/src/queries/students.ts
index d7876f5a..822083d9 100644
--- a/frontend/src/queries/students.ts
+++ b/frontend/src/queries/students.ts
@@ -19,7 +19,7 @@ import type { AssignmentsResponse } from "@/controllers/assignments.ts";
 import type { GroupsResponse } from "@/controllers/groups.ts";
 import type { SubmissionsResponse } from "@/controllers/submissions.ts";
 import type { QuestionsResponse } from "@/controllers/questions.ts";
-import type { StudentDTO } from "dwengo-1-common/src/interfaces/student";
+import type { StudentDTO } from "@dwengo-1/interfaces/student";
 
 const studentController = new StudentController();
 
diff --git a/frontend/src/queries/teachers.ts b/frontend/src/queries/teachers.ts
index 6c7fc56e..778b2cba 100644
--- a/frontend/src/queries/teachers.ts
+++ b/frontend/src/queries/teachers.ts
@@ -5,7 +5,7 @@ import { TeacherController, type TeacherResponse, type TeachersResponse } from "
 import type { ClassesResponse } from "@/controllers/classes.ts";
 import type { JoinRequestResponse, JoinRequestsResponse, StudentsResponse } from "@/controllers/students.ts";
 import type { QuestionsResponse } from "@/controllers/questions.ts";
-import type { TeacherDTO } from "dwengo-1-common/src/interfaces/teacher";
+import type { TeacherDTO } from "@dwengo-1/interfaces/teacher";
 import { studentJoinRequestQueryKey, studentJoinRequestsQueryKey } from "@/queries/students.ts";
 
 const teacherController = new TeacherController();
diff --git a/frontend/src/queries/themes.ts b/frontend/src/queries/themes.ts
index c474efcd..3bba92db 100644
--- a/frontend/src/queries/themes.ts
+++ b/frontend/src/queries/themes.ts
@@ -1,9 +1,9 @@
 import { useQuery, type UseQueryReturnType } from "@tanstack/vue-query";
 import { type MaybeRefOrGetter, toValue } from "vue";
-import { ThemeController } from "@/controllers/themes.ts";
-import type { Theme } from "../../../common/src/interfaces/theme";
+import type { Theme } from "@dwengo-1/interfaces/theme";
+import {getThemeController} from "@/controllers/controllers.ts";
 
-const themeController = new ThemeController();
+const themeController = getThemeController();
 
 export function useThemeQuery(language: MaybeRefOrGetter<string | undefined>): UseQueryReturnType<Theme[], Error> {
     return useQuery({