diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 000000000..399423a21
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,16 @@
+{
+  "printWidth": 90,
+  "useTabs": true,
+  "tabWidth": 2,
+  "singleQuote": false,
+  "bracketSpacing": true,
+  "proseWrap": "preserve",
+  "bracketSameLine": false,
+  "singleAttributePerLine": true,
+  "semi": true,
+  "jsx-single-quote": false,
+  "quoteProps": "as-needed",
+  "arrowParens": "always",
+  "trailingComma": "es5",
+  "htmlWhitespaceSensitivity": "css"
+}
diff --git a/Client/package-lock.json b/Client/package-lock.json
index 4077ce2bf..c78e9e33a 100644
--- a/Client/package-lock.json
+++ b/Client/package-lock.json
@@ -41,6 +41,7 @@
         "eslint-plugin-react": "^7.34.1",
         "eslint-plugin-react-hooks": "^4.6.0",
         "eslint-plugin-react-refresh": "^0.4.6",
+        "prettier": "^3.3.3",
         "vite": "^5.2.0"
       }
     },
@@ -5314,6 +5315,22 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/prettier": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
     "node_modules/prop-types": {
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
diff --git a/Client/package.json b/Client/package.json
index 22f15f7f9..948114e35 100644
--- a/Client/package.json
+++ b/Client/package.json
@@ -43,6 +43,7 @@
     "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.6",
+    "prettier": "^3.3.3",
     "vite": "^5.2.0"
   }
 }
diff --git a/Client/src/App.css b/Client/src/App.css
index bf3d4ea92..44e06cd5f 100644
--- a/Client/src/App.css
+++ b/Client/src/App.css
@@ -1,7 +1,7 @@
 .card {
-  padding: 2em;
+	padding: 2em;
 }
 
 .read-the-docs {
-  color: #888;
+	color: #888;
 }
diff --git a/Client/src/App.jsx b/Client/src/App.jsx
index cc9de1304..9093b00fc 100644
--- a/Client/src/App.jsx
+++ b/Client/src/App.jsx
@@ -70,7 +70,11 @@ function App() {
     <ThemeProvider theme={mode === "light" ? lightTheme : darkTheme}>
       <CssBaseline />
       <Routes>
-        <Route exact path="/" element={<HomeLayout />}>
+        <Route
+          exact
+          path="/"
+          element={<HomeLayout />}
+        >
           <Route
             exact
             path="/"
@@ -119,21 +123,34 @@ function App() {
           />
           <Route
             path="advanced-settings"
-            element={
-              <ProtectedRoute Component={AdvancedSettingsWithAdminProp} />
-            }
+            element={<ProtectedRoute Component={AdvancedSettingsWithAdminProp} />}
           />
           <Route
             path="account/profile"
-            element={<ProtectedRoute Component={Account} open="profile" />}
+            element={
+              <ProtectedRoute
+                Component={Account}
+                open="profile"
+              />
+            }
           />
           <Route
             path="account/password"
-            element={<ProtectedRoute Component={Account} open="password" />}
+            element={
+              <ProtectedRoute
+                Component={Account}
+                open="password"
+              />
+            }
           />
           <Route
             path="account/team"
-            element={<ProtectedRoute Component={Account} open="team" />}
+            element={
+              <ProtectedRoute
+                Component={Account}
+                open="team"
+              />
+            }
           />
           <Route
             path="pagespeed"
@@ -145,9 +162,7 @@ function App() {
           />
           <Route
             path="pagespeed/:monitorId"
-            element={
-              <ProtectedRoute Component={PageSpeedDetailsWithAdminProp} />
-            }
+            element={<ProtectedRoute Component={PageSpeedDetailsWithAdminProp} />}
           />
           <Route
             path="pagespeed/configure/:monitorId"
@@ -155,15 +170,39 @@ function App() {
           />
         </Route>
 
-        <Route exact path="/login" element={<Login />} />
+        <Route
+          exact
+          path="/login"
+          element={<Login />}
+        />
 
-        <Route exact path="/register" element={<AdminCheckedRegister />} />
-        <Route exact path="/register/:token" element={<Register />} />
+        <Route
+          exact
+          path="/register"
+          element={<AdminCheckedRegister />}
+        />
+        <Route
+          exact
+          path="/register/:token"
+          element={<Register />}
+        />
         {/* <Route path="/toast" element={<ToastComponent />} /> */}
-        <Route path="*" element={<NotFound />} />
-        <Route path="/forgot-password" element={<ForgotPassword />} />
-        <Route path="/check-email" element={<CheckEmail />} />
-        <Route path="/set-new-password/:token" element={<SetNewPassword />} />
+        <Route
+          path="*"
+          element={<NotFound />}
+        />
+        <Route
+          path="/forgot-password"
+          element={<ForgotPassword />}
+        />
+        <Route
+          path="/check-email"
+          element={<CheckEmail />}
+        />
+        <Route
+          path="/set-new-password/:token"
+          element={<SetNewPassword />}
+        />
         <Route
           path="/new-password-confirmed"
           element={<NewPasswordConfirmed />}
diff --git a/Server/package-lock.json b/Server/package-lock.json
index 09793bb98..9bd1bae41 100644
--- a/Server/package-lock.json
+++ b/Server/package-lock.json
@@ -6554,6 +6554,7 @@
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
       "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
+      "license": "MIT",
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
diff --git a/Server/package.json b/Server/package.json
index cb6997132..df9ab3343 100644
--- a/Server/package.json
+++ b/Server/package.json
@@ -37,6 +37,7 @@
   },
   "devDependencies": {
     "nodemon": "3.1.0",
+    "prettier": "^3.3.3"
     "nyc": "17.1.0",
     "proxyquire": "2.1.3",
     "sinon": "19.0.2"
diff --git a/Server/routes/authRoute.js b/Server/routes/authRoute.js
index ce6ec440e..57067f564 100644
--- a/Server/routes/authRoute.js
+++ b/Server/routes/authRoute.js
@@ -7,39 +7,24 @@ const upload = multer();
 const User = require("../db/models/User");
 
 const {
-  registerUser,
-  loginUser,
-  editUser,
-  requestRecovery,
-  validateRecovery,
-  resetPassword,
-  checkSuperadminExists,
-  getAllUsers,
-  deleteUser,
+	registerUser,
+	loginUser,
+	editUser,
+	requestRecovery,
+	validateRecovery,
+	resetPassword,
+	checkSuperadminExists,
+	getAllUsers,
+	deleteUser,
 } = require("../controllers/authController");
 
 //Auth routes
 router.post("/register", upload.single("profileImage"), registerUser);
 router.post("/login", loginUser);
-router.put(
-  "/user/:userId",
-  upload.single("profileImage"),
-  verifyJWT,
-  editUser
-);
+router.put("/user/:userId", upload.single("profileImage"), verifyJWT, editUser);
 router.get("/users/superadmin", checkSuperadminExists);
-router.get(
-  "/users",
-  verifyJWT,
-  isAllowed(["admin", "superadmin"]),
-  getAllUsers
-);
-router.delete(
-  "/user/:userId",
-  verifyJWT,
-  verifyOwnership(User, "userId"),
-  deleteUser
-);
+router.get("/users", verifyJWT, isAllowed(["admin", "superadmin"]), getAllUsers);
+router.delete("/user/:userId", verifyJWT, verifyOwnership(User, "userId"), deleteUser);
 
 //Recovery routes
 router.post("/recovery/request", requestRecovery);