diff --git a/client/src/Features/Auth/authSlice.js b/client/src/Features/Auth/authSlice.js
deleted file mode 100644
index d6c63b6a9..000000000
--- a/client/src/Features/Auth/authSlice.js
+++ /dev/null
@@ -1,262 +0,0 @@
-import { networkService } from "../../main";
-import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
-import axios from "axios";
-
-const initialState = {
-	isLoading: false,
-	authToken: "",
-	user: "",
-	success: null,
-	msg: null,
-};
-
-export const register = createAsyncThunk(
-	"auth/register",
-	async ({ user, token }, thunkApi) => {
-		try {
-			const res = await networkService.registerUser(user, token);
-			return res.data;
-		} catch (error) {
-			if (error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const login = createAsyncThunk("auth/login", async (form, thunkApi) => {
-	try {
-		const res = await networkService.loginUser(form);
-		return res.data;
-	} catch (error) {
-		if (error.response && error.response.data) {
-			return thunkApi.rejectWithValue(error.response.data);
-		}
-		const payload = {
-			status: false,
-			msg: error.message ? error.message : "Unknown error",
-		};
-		return thunkApi.rejectWithValue(payload);
-	}
-});
-
-export const update = createAsyncThunk("auth/update", async (data, thunkApi) => {
-	const { localData: form } = data;
-	try {
-		const fd = new FormData();
-		form.firstName && fd.append("firstName", form.firstName);
-		form.lastName && fd.append("lastName", form.lastName);
-		form.password && fd.append("password", form.password);
-		form.newPassword && fd.append("newPassword", form.newPassword);
-		if (form.file && form.file !== "") {
-			const imageResult = await axios.get(form.file, {
-				responseType: "blob",
-			});
-			fd.append("profileImage", imageResult.data);
-		}
-		form.deleteProfileImage && fd.append("deleteProfileImage", form.deleteProfileImage);
-
-		const res = await networkService.updateUser({
-			form: fd,
-		});
-		return res.data;
-	} catch (error) {
-		if (error.response && error.response.data) {
-			return thunkApi.rejectWithValue(error.response.data);
-		}
-		const payload = {
-			status: false,
-			msg: error.message ? error.message : "Unknown error",
-		};
-		return thunkApi.rejectWithValue(payload);
-	}
-});
-
-export const deleteUser = createAsyncThunk("auth/delete", async (_, thunkApi) => {
-	try {
-		const res = await networkService.deleteUser();
-		return res.data;
-	} catch (error) {
-		if (error.response && error.response.data) {
-			return thunkApi.rejectWithValue(error.response.data);
-		}
-		const payload = {
-			status: false,
-			msg: error.message ? error.message : "Unknown error",
-		};
-		return thunkApi.rejectWithValue(payload);
-	}
-});
-
-export const forgotPassword = createAsyncThunk(
-	"auth/forgotPassword",
-	async (form, thunkApi) => {
-		try {
-			const res = await networkService.forgotPassword(form);
-			return res.data;
-		} catch (error) {
-			if (error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-export const setNewPassword = createAsyncThunk(
-	"auth/setNewPassword",
-	async (data, thunkApi) => {
-		const { token, form } = data;
-		try {
-			await networkService.validateRecoveryToken({ recoveryToken: token });
-			const res = await networkService.setNewPassword({
-				recoveryToken: token,
-				form: form,
-			});
-			return res.data;
-		} catch (error) {
-			if (error.response.data) {
-				return thunkApi.rejectWithValue(error.response.data);
-			}
-			const payload = {
-				status: false,
-				msg: error.message ? error.message : "Unknown error",
-			};
-			return thunkApi.rejectWithValue(payload);
-		}
-	}
-);
-
-const handleAuthFulfilled = (state, action) => {
-	state.isLoading = false;
-	state.success = action.payload.success;
-	state.msg = action.payload.msg;
-	state.authToken = action.payload.data.token;
-	state.user = action.payload.data.user;
-};
-const handleAuthRejected = (state, action) => {
-	state.isLoading = false;
-	state.success = false;
-	state.msg = action.payload ? action.payload.msg : "Failed to login or register";
-};
-const handleUpdateFulfilled = (state, action) => {
-	state.isLoading = false;
-	state.success = action.payload.success;
-	state.msg = action.payload.msg;
-	state.user = action.payload.data;
-};
-const handleUpdateRejected = (state, action) => {
-	state.isLoading = false;
-	state.success = false;
-	state.msg = action.payload ? action.payload.msg : "Failed to update profile data.";
-};
-const handleDeleteFulfilled = (state, action) => {
-	state.isLoading = false;
-	state.success = action.payload.success;
-	state.msg = action.payload.msg;
-};
-const handleDeleteRejected = (state, action) => {
-	state.isLoading = false;
-	state.success = false;
-	state.msg = action.payload ? action.payload.msg : "Failed to delete account.";
-};
-const handleForgotFulfilled = (state, action) => {
-	state.isLoading = false;
-	state.success = action.payload.success;
-	state.msg = action.payload.msg;
-};
-const handleForgotRejected = (state, action) => {
-	state.isLoading = false;
-	state.success = false;
-	state.msg = action.payload ? action.payload.msg : "Failed to send reset instructions.";
-};
-const handleNewPasswordRejected = (state, action) => {
-	state.isLoading = false;
-	state.success = false;
-	state.msg = action.payload ? action.payload.msg : "Failed to reset password.";
-};
-
-const authSlice = createSlice({
-	name: "auth",
-	initialState,
-	reducers: {
-		clearAuthState: (state) => {
-			state.authToken = "";
-			state.user = "";
-			state.isLoading = false;
-			state.success = true;
-			state.msg = "Logged out successfully";
-		},
-		setAuthState: (state, action) => {
-			state.isLoading = false;
-			state.success = action.payload.success;
-			state.msg = action.payload.msg;
-			state.authToken = action.payload.data.token;
-			state.user = action.payload.data.user;
-		},
-		setUser: (state, action) => {
-			state.user = action.payload;
-		},
-	},
-	extraReducers: (builder) => {
-		// Register thunk
-		builder
-			.addCase(register.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(register.fulfilled, handleAuthFulfilled)
-			.addCase(register.rejected, handleAuthRejected);
-
-		// Login thunk
-		builder
-			.addCase(login.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(login.fulfilled, handleAuthFulfilled)
-			.addCase(login.rejected, handleAuthRejected);
-
-		// Update thunk
-		builder
-			.addCase(update.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(update.fulfilled, handleUpdateFulfilled)
-			.addCase(update.rejected, handleUpdateRejected);
-
-		// Delete thunk
-		builder
-			.addCase(deleteUser.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(deleteUser.fulfilled, handleDeleteFulfilled)
-			.addCase(deleteUser.rejected, handleDeleteRejected);
-
-		// Forgot password thunk
-		builder
-			.addCase(forgotPassword.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(forgotPassword.fulfilled, handleForgotFulfilled)
-			.addCase(forgotPassword.rejected, handleForgotRejected);
-
-		// Set new password thunk
-		builder
-			.addCase(setNewPassword.pending, (state) => {
-				state.isLoading = true;
-			})
-			.addCase(setNewPassword.fulfilled, handleAuthFulfilled)
-			.addCase(setNewPassword.rejected, handleNewPasswordRejected);
-	},
-});
-
-export default authSlice.reducer;
-export const { clearAuthState, setAuthState, setUser } = authSlice.actions;
diff --git a/client/src/Features/Auth/authSlice.ts b/client/src/Features/Auth/authSlice.ts
new file mode 100644
index 000000000..aa4401c79
--- /dev/null
+++ b/client/src/Features/Auth/authSlice.ts
@@ -0,0 +1,53 @@
+import { createSlice, type PayloadAction } from "@reduxjs/toolkit";
+import type { User } from "@/Types/User";
+
+interface AuthState {
+	isLoading: boolean;
+	authToken: string;
+	user: User | null;
+	success: boolean | null;
+	msg: string | null;
+}
+
+const initialState: AuthState = {
+	isLoading: false,
+	authToken: "",
+	user: null,
+	success: null,
+	msg: null,
+};
+
+const authSlice = createSlice({
+	name: "auth",
+	initialState,
+	reducers: {
+		clearAuthState: (state) => {
+			state.authToken = "";
+			state.user = null;
+			state.isLoading = false;
+			state.success = true;
+			state.msg = "Logged out successfully";
+		},
+		setAuthState: (
+			state,
+			action: PayloadAction<{
+				success: boolean;
+				msg: string;
+				data: { token: string; user: User };
+			}>
+		) => {
+			state.isLoading = false;
+			state.success = action.payload.success;
+			state.msg = action.payload.msg;
+			state.authToken = action.payload.data.token;
+			state.user = action.payload.data.user;
+		},
+		setUser: (state, action: PayloadAction<User>) => {
+			state.user = action.payload;
+		},
+	},
+});
+
+export type { AuthState };
+export default authSlice.reducer;
+export const { clearAuthState, setAuthState, setUser } = authSlice.actions;
diff --git a/client/src/Features/UI/uiSlice.js b/client/src/Features/UI/uiSlice.js
index 014940a9a..0e8ca8608 100644
--- a/client/src/Features/UI/uiSlice.js
+++ b/client/src/Features/UI/uiSlice.js
@@ -4,8 +4,6 @@ const initialMode = window?.matchMedia?.("(prefers-color-scheme: dark)")?.matche
 	? "dark"
 	: "light";
 
-// Initial state for UI settings.
-// Add more settings as needed (e.g., theme preferences, user settings)
 const initialState = {
 	monitors: {
 		rowsPerPage: 10,