diff --git a/nuxt.config.ts b/nuxt.config.ts
index 2d111ff..8e93e9a 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -1,20 +1,39 @@
 import tailwindcss from "@tailwindcss/vite";
 
 export default defineNuxtConfig({
-  compatibilityDate: "2026-01-01",
-  devtools: { enabled: true },
+<<<<<<< HEAD
+    compatibilityDate: "2026-01-01",
+    devtools: { enabled: true },
 
-  css: ["~/assets/css/tailwind.css"],
-  
-  vite: {
-    plugins: [tailwindcss()],
-  },
-
-  runtimeConfig: {
-    public: {
-      apiBase: "http://localhost:8080/academics/api/v1",
+    css: [
+        "~/assets/css/main.css",
+        "~/assets/css/tailwind.css"
+    ],
+    vite: {
+        plugins: [tailwindcss()],
     },
-  },
 
-  modules: ["@pinia/nuxt"], 
-});
\ No newline at end of file
+    runtimeConfig: {
+        public: {
+            apiBase: "http://localhost:8080/academics/api/v1",
+        },
+    },
+
+    modules: [
+        "@nuxt/fonts",
+        "@nuxt/icon",
+        "@nuxt/image",
+        "@nuxt/eslint",
+        "shadcn-nuxt",
+        "@pinia/nuxt",
+    ],
+
+    shadcn: {
+        prefix: "",
+        /**
+         * Directory that the component lives in.
+         * @default "./app/components/ui"
+         */
+        componentDir: "./app/components/ui",
+    },
+});