diff --git a/client/src/api/core/OpenAPI.ts b/client/src/api/core/OpenAPI.ts
index 77fa96a..03da729 100644
--- a/client/src/api/core/OpenAPI.ts
+++ b/client/src/api/core/OpenAPI.ts
@@ -29,4 +29,4 @@ export const OpenAPI: OpenAPIConfig = {
     PASSWORD: undefined,
     HEADERS: undefined,
     ENCODE_PATH: undefined,
-};
+};
diff --git a/client/src/api/services/DefaultService.ts b/client/src/api/services/DefaultService.ts
index 4ceef98..f1f9076 100644
--- a/client/src/api/services/DefaultService.ts
+++ b/client/src/api/services/DefaultService.ts
@@ -149,86 +149,6 @@ export class DefaultService {
       },
     });
   }
-  /**
-   * Get system income categories
-   * @returns any List of system income categories"
-   * @throws ApiError
-   */
-  public static getIncomesCategories(): CancelablePromise<any> {
-    return __request(OpenAPI, {
-      method: "GET",
-      url: "/incomes/categories",
-    });
-  }
-  /**
-   * Get user's custom income categories
-   * @returns any List of user's custom income categories
-   * @throws ApiError
-   */
-  public static getIncomesCustomCategories(): CancelablePromise<any> {
-    return __request(OpenAPI, {
-      method: "GET",
-      url: "/incomes/custom-categories",
-    });
-  }
-  /**
-   * Create a new custom income category
-   * @param requestBody
-   * @returns any Income category created
-   * @throws ApiError
-   */
-  public static postIncomesCustomCategories(requestBody: {
-    category_name: string;
-    icon_url?: string;
-  }): CancelablePromise<any> {
-    return __request(OpenAPI, {
-      method: "POST",
-      url: "/incomes/custom-categories",
-      body: requestBody,
-      mediaType: "application/json",
-    });
-  }
-  /**
-   * Update an income category
-   * @param id
-   * @param requestBody
-   * @returns any Income category updated
-   * @throws ApiError
-   */
-  public static putIncomesCustomCategories(
-    id: string,
-    requestBody: {
-      category_name: string;
-      icon_url?: string;
-    }
-  ): CancelablePromise<any> {
-    return __request(OpenAPI, {
-      method: "PUT",
-      url: "/incomes/custom-categories/{id}",
-      path: {
-        id: id,
-      },
-      body: requestBody,
-      mediaType: "application/json",
-    });
-  }
-  /**
-   * Delete an income category
-   * @param id
-   * @returns void
-   * @throws ApiError
-   */
-  public static deleteIncomesCustomCategories(
-    id: string
-  ): CancelablePromise<void> {
-    return __request(OpenAPI, {
-      method: "DELETE",
-      url: "/incomes/custom-categories/{id}",
-      path: {
-        id: id,
-      },
-    });
-  }
   /**
    * List all incomes
    * @param start
@@ -257,10 +177,9 @@ export class DefaultService {
    */
   public static postIncomes(requestBody?: {
     amount: number;
-    date?: string;
+    date: string;
     source?: string;
     description?: string;
-    category_id?: number;
   }): CancelablePromise<any> {
     return __request(OpenAPI, {
       method: "POST",
diff --git a/client/src/components/IncomeForm.tsx b/client/src/components/IncomeForm.tsx
index eac4750..c6a8ef0 100644
--- a/client/src/components/IncomeForm.tsx
+++ b/client/src/components/IncomeForm.tsx
@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from "react";
 import type { Income, IncomeFormData } from "../types/Income";
-import { useIncomeCategories } from "../hooks/useIncomeCategories";
-import { Button, TextField, Select, Dialog, Skeleton } from "../ui";
+import { Button, TextField, Dialog, DatePicker } from "../ui";
 import { useMascot } from "../hooks/useMascot";
 
 interface IncomeFormProps {
@@ -17,18 +16,16 @@ export const IncomeForm: React.FC<IncomeFormProps> = ({
   onCancel,
   open,
 }) => {
-  const { categories, loading: categoriesLoading } = useIncomeCategories();
   const [saving, setSaving] = useState(false);
   const { showSuccess, showError } = useMascot();
 
   const [formData, setFormData] = useState<IncomeFormData>({
-    amount: income?.amount || 0,
+    amount: income?.amount || 1,
     date: income?.date
       ? new Date(income.date).toISOString().split("T")[0]
       : new Date().toISOString().split("T")[0],
     source: income?.source || "",
     description: income?.description || "",
-    category_id: income?.category_id || 1,
   });
 
   useEffect(() => {
@@ -38,15 +35,13 @@ export const IncomeForm: React.FC<IncomeFormProps> = ({
         date: new Date(income.date).toISOString().split("T")[0],
         source: income.source,
         description: income.description || "",
-        category_id: income.category_id,
       });
     } else {
       setFormData({
-        amount: 0,
+        amount: 1,
         date: new Date().toISOString().split("T")[0],
         source: "",
         description: "",
-        category_id: 1,
       });
     }
   }, [income, open]);
@@ -72,11 +67,17 @@ export const IncomeForm: React.FC<IncomeFormProps> = ({
   ) => {
     setFormData((prev) => ({
       ...prev,
-      [field]:
-        field === "amount" || field === "category_id" ? Number(value) : value,
+      [field]: field === "amount" ? Number(value) : value,
     }));
   };
 
+  const handleDateChange = (date: Date | null) => {
+    if (date) {
+      const formattedDate = date.toISOString().split("T")[0];
+      handleChange("date", formattedDate);
+    }
+  };
+
   return (
     <Dialog
       open={open}
@@ -91,14 +92,15 @@ export const IncomeForm: React.FC<IncomeFormProps> = ({
           onChange={(e) => handleChange("amount", e.target.value)}
           required
           fullWidth
+           min={1} 
         />
 
-        <TextField
+        <DatePicker
+          value={formData.date ? new Date(formData.date) : new Date()}
+          onChange={handleDateChange}
           label="Date"
-          type="date"
-          value={formData.date ?? ""}
-          onChange={(e) => handleChange("date", e.target.value)}
-          fullWidth
+          size="medium"
+          required
         />
 
         <TextField
@@ -106,26 +108,9 @@ export const IncomeForm: React.FC<IncomeFormProps> = ({
           value={formData.source ?? ""}
           onChange={(e) => handleChange("source", e.target.value)}
           fullWidth
+          required
         />
 
-        {categoriesLoading ? (
-          <Skeleton variant="rect" height={56} rounded="rounded-md" />
-        ) : (
-          <div>
-            <label className="block mb-1 text-sm font-medium text-gray-700">
-              Category
-            </label>
-            <Select
-              value={formData.category_id ?? null}
-              onChange={(value) => handleChange("category_id", value)}
-              options={categories.map((cat) => ({
-                label: cat.category_name,
-                value: cat.category_id,
-              }))}
-            />
-          </div>
-        )}
-
         <TextField
           label="Description"
           value={formData.description || ""}
diff --git a/client/src/components/IncomeList.tsx b/client/src/components/IncomeList.tsx
index 1adfadf..eae35b2 100644
--- a/client/src/components/IncomeList.tsx
+++ b/client/src/components/IncomeList.tsx
@@ -1,7 +1,7 @@
 import { forwardRef, useImperativeHandle } from "react";
 import type { Income } from "../types/Income";
 import { useIncomes } from "../hooks/useIncomes";
-import { Button, Chip } from "../ui";
+import { Button } from "../ui";
 
 interface IncomeListProps {
   startDate?: string;
@@ -65,13 +65,6 @@ export const IncomeList = forwardRef<IncomeListRef, IncomeListProps>(
                       <h3 className="font-medium text-lg">
                         {income.amount.toFixed(2)} MGA
                       </h3>
-                      {income.category && (
-                        <Chip
-                          label={income.category.category_name}
-                          size="small"
-                          className="bg-blue-100 text-blue-800"
-                        />
-                      )}
                     </div>
                     <p className="text-gray-600 mb-1">{income.source}</p>
                     {income.description && (
diff --git a/client/src/hooks/useIncomeCategories.ts b/client/src/hooks/useIncomeCategories.ts
deleted file mode 100644
index 7684f7e..0000000
--- a/client/src/hooks/useIncomeCategories.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import type { IncomeCategory } from "../types/Income";
-import { IncomeService } from "../services/IncomeService";
-import { useState, useEffect } from "react";
-
-export const useIncomeCategories = () => {
-  const [categories, setCategories] = useState<IncomeCategory[]>([]);
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState<string | null>(null);
-
-  useEffect(() => {
-    const fetchCategories = async () => {
-      try {
-        setLoading(true);
-        setError(null);
-        const data = await IncomeService.getIncomeCategories();
-        setCategories(data);
-      } catch (err) {
-        setError(
-          err instanceof Error ? err.message : "Failed to fetch categories"
-        );
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    fetchCategories();
-  }, []);
-
-  const refetch = async () => {
-    try {
-      setLoading(true);
-      setError(null);
-      const data = await IncomeService.getIncomeCategories();
-      setCategories(data);
-    } catch (err) {
-      setError(
-        err instanceof Error ? err.message : "Failed to refetch categories"
-      );
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  return { categories, loading, error, refetch };
-};
diff --git a/client/src/pages/IncomesPage.tsx b/client/src/pages/IncomesPage.tsx
index bc88eeb..94f30cc 100644
--- a/client/src/pages/IncomesPage.tsx
+++ b/client/src/pages/IncomesPage.tsx
@@ -1,7 +1,7 @@
 import { useState, useRef } from "react";
 import type { Income } from "../types/Income";
 import { IncomeList } from "../components/IncomeList";
-import { Button, TextField, Dialog, useToast } from "../ui";
+import { Button, Dialog, useToast, DatePicker } from "../ui";
 import { IncomeService } from "../services/IncomeService";
 import { useNavigate } from "react-router-dom";
 
@@ -33,7 +33,6 @@ export const IncomesPage = () => {
       toast.success("Income deleted successfully");
       setDeleteConfirmOpen(false);
       setIncomeToDelete(null);
-      //refresh after every operations
       incomeListRef.current?.refetch();
     } catch (error) {
       const message =
@@ -46,6 +45,20 @@ export const IncomesPage = () => {
     navigate("/incomes/new");
   };
 
+  const handleStartDateChange = (date: Date | null) => {
+    setDateFilter((prev) => ({
+      ...prev,
+      start: date ? date.toISOString().split("T")[0] : undefined,
+    }));
+  };
+
+  const handleEndDateChange = (date: Date | null) => {
+    setDateFilter((prev) => ({
+      ...prev,
+      end: date ? date.toISOString().split("T")[0] : undefined,
+    }));
+  };
+
   return (
     <div className="p-6 max-w-4xl mx-auto relative z-2">
       <div className="flex pt-20 justify-between items-center mb-6">
@@ -60,27 +73,17 @@ export const IncomesPage = () => {
 
       <div className="bg-white rounded-lg shadow p-6 mb-6">
         <div className="grid grid-cols-1 md:grid-cols-2 gap-4 mb-6">
-          <TextField
-            label="From Date"
-            type="date"
-            value={dateFilter.start || ""}
-            onChange={(e) =>
-              setDateFilter((prev) => ({
-                ...prev,
-                start: e.target.value || undefined,
-              }))
-            }
+          <DatePicker
+            value={dateFilter.start ? new Date(dateFilter.start) : null}
+            onChange={handleStartDateChange}
+            label="Start Date"
+            size="medium"
           />
-          <TextField
-            label="To Date"
-            type="date"
-            value={dateFilter.end || ""}
-            onChange={(e) =>
-              setDateFilter((prev) => ({
-                ...prev,
-                end: e.target.value || undefined,
-              }))
-            }
+          <DatePicker
+            value={dateFilter.end ? new Date(dateFilter.end) : null}
+            onChange={handleEndDateChange}
+            label="End Date"
+            size="medium"
           />
         </div>
 
@@ -118,10 +121,10 @@ export const IncomesPage = () => {
         {incomeToDelete && (
           <div className="mt-3 p-3 bg-gray-50 rounded">
             <p>
-              <strong>Amount:</strong> ${incomeToDelete.amount.toFixed(2)}
+              <strong>Amount: </strong>{incomeToDelete.amount.toFixed(2)} MGA
             </p>
             <p>
-              <strong>Source:</strong> {incomeToDelete.source}
+              <strong>Source:</strong> {incomeToDelete.source.length > 0 ? incomeToDelete.source : "-"}
             </p>
             <p>
               <strong>Date:</strong>{" "}
diff --git a/client/src/services/IncomeService.ts b/client/src/services/IncomeService.ts
index 30ed6c9..5dfc3bf 100644
--- a/client/src/services/IncomeService.ts
+++ b/client/src/services/IncomeService.ts
@@ -2,7 +2,6 @@ import { DefaultService } from "../api/services/DefaultService";
 import { useMascotStore } from "../stores/mascotStore";
 import type {
   Income,
-  IncomeCategory,
   CreateIncomeRequest,
   UpdateIncomeRequest,
 } from "../types/Income";
@@ -16,7 +15,6 @@ export class IncomeService {
       return response as Income[];
     } catch (error) {
       useMascotStore.getState().setExpression("error");
-
       console.error("Error fetching incomes:", error);
       throw new Error("Failed to fetch incomes");
     }
@@ -27,11 +25,9 @@ export class IncomeService {
     try {
       const response = await DefaultService.getIncomes1(id);
       useMascotStore.getState().setExpression("success");
-
       return response as Income;
     } catch (error) {
       useMascotStore.getState().setExpression("error");
-
       console.error(`Error fetching income ${id}:`, error);
       throw new Error("Failed to fetch income");
     }
@@ -45,9 +41,6 @@ export class IncomeService {
         amount: Number(incomeData.amount),
       };
 
-      if (incomeData.date) {
-        requestData.date = incomeData.date;
-      }
       const response = await DefaultService.postIncomes(requestData);
       useMascotStore.getState().setExpression("success");
       return response as Income;
@@ -68,11 +61,9 @@ export class IncomeService {
 
       const response = await DefaultService.putIncomes(id, requestData);
       useMascotStore.getState().setExpression("success");
-
       return response as Income;
     } catch (error) {
       useMascotStore.getState().setExpression("error");
-
       console.error(`Error updating income ${id}:`, error);
       throw new Error("Failed to update income");
     }
@@ -85,90 +76,8 @@ export class IncomeService {
       useMascotStore.getState().setExpression("success");
     } catch (error) {
       useMascotStore.getState().setExpression("error");
-
       console.error(`Error deleting income ${id}:`, error);
       throw new Error("Failed to delete income");
     }
   }
-
-  //GET ALL income categories (custom and system)
-  static async getIncomeCategories() {
-    try {
-      const response = await DefaultService.getIncomesCategories();
-      useMascotStore.getState().setExpression("success");
-
-      return response as IncomeCategory[];
-    } catch (error) {
-      useMascotStore.getState().setExpression("error");
-
-      console.error("Error fetching income categories:", error);
-      throw new Error("Failed to fetch income categories");
-    }
-  }
-
-  //GET custom categories
-  static async getCustomIncomeCategories() {
-    try {
-      const response = await DefaultService.getIncomesCustomCategories();
-      useMascotStore.getState().setExpression("success");
-
-      return response as IncomeCategory[];
-    } catch (error) {
-      useMascotStore.getState().setExpression("error");
-
-      console.error("Error fetching custom income categories:", error);
-      throw new Error("Failed to fetch custom income categories");
-    }
-  }
-
-  //POST new category
-  static async createIncomeCategory(name: string) {
-    try {
-      const response = await DefaultService.postIncomesCustomCategories({
-        category_name: name,
-      });
-      useMascotStore.getState().setExpression("success");
-
-      return response as IncomeCategory;
-    } catch (error) {
-      useMascotStore.getState().setExpression("error");
-
-      console.error("Error creating income category:", error);
-      throw new Error("Failed to create income category");
-    }
-  }
-
-  //UPDATE a category
-  static async updateIncomeCategory(
-    id: string,
-    name: string
-  ): Promise<IncomeCategory> {
-    try {
-      const response = await DefaultService.putIncomesCustomCategories(id, {
-        category_name: name,
-      });
-      useMascotStore.getState().setExpression("success");
-
-      return response as IncomeCategory;
-    } catch (error) {
-      useMascotStore.getState().setExpression("error");
-
-      console.error(`Error updating income category ${id}:`, error);
-      throw new Error("Failed to update income category");
-    }
-  }
-
-  //DELETE category
-  static async deleteIncomeCategory(id: string) {
-    try {
-      useMascotStore.getState().setExpression("success");
-
-      await DefaultService.deleteIncomesCustomCategories(id);
-    } catch (error) {
-      useMascotStore.getState().setExpression("error");
-
-      console.error(`Error deleting income category ${id}:`, error);
-      throw new Error("Failed to delete income category");
-    }
-  }
 }
diff --git a/client/src/types/Income.ts b/client/src/types/Income.ts
index 1a11bb1..e9ca23f 100644
--- a/client/src/types/Income.ts
+++ b/client/src/types/Income.ts
@@ -6,8 +6,6 @@ export interface Income {
   description?: string;
   creation_date: string;
   user_id: number;
-  category_id: number;
-  category?: IncomeCategory;
 }
 
 export interface IncomeFormData {
@@ -15,25 +13,13 @@ export interface IncomeFormData {
   date: string;
   source: string;
   description: string;
-  category_id: number;
-}
-
-export interface IncomeCategory {
-  category_id: number;
-  category_name: string;
-  icon_url?: string;
-  is_custom: boolean;
-  user_id?: number;
-  created_at: string;
-  updated_at: string;
 }
 
 export interface CreateIncomeRequest {
   amount: number;
-  date?: string;
+  date: string;
   source: string;
   description?: string;
-  category_id: number;
 }
 
 export interface UpdateIncomeRequest {
@@ -41,5 +27,4 @@ export interface UpdateIncomeRequest {
   date?: string;
   source?: string;
   description?: string;
-  category_id?: number;
 }
diff --git a/server/controllers/income.controller.js b/server/controllers/income.controller.js
index 2226afa..6b98842 100644
--- a/server/controllers/income.controller.js
+++ b/server/controllers/income.controller.js
@@ -4,10 +4,12 @@ import { asyncHandler } from "../utils/asyncHandler.js";
 //---------------INCOME---------------//
 
 export const createIncome = asyncHandler(async (req, res) => {
-  const { amount, date, source, description, category_id } = req.body;
+  const { amount, date, source, description } = req.body;
 
-  if (!amount) {
-    return res.status(400).json({ error: "Missing required fields" });
+  if (!amount || !date) {
+    return res
+      .status(400)
+      .json({ error: "Missing required fields: amount and date are required" });
   }
 
   const incomeData = {
@@ -16,21 +18,11 @@ export const createIncome = asyncHandler(async (req, res) => {
     description: description || "",
   };
 
-  if (category_id) {
-    incomeData.category = { connect: { category_id: parseInt(category_id) } };
+  const parsedDate = new Date(date);
+  if (!isNaN(parsedDate.getTime())) {
+    incomeData.date = parsedDate;
   } else {
-    incomeData.category = { connect: { category_id: 1 } };
-  }
-
-  if (date) {
-    const parsedDate = new Date(date);
-    if (!isNaN(parsedDate.getTime())) {
-      incomeData.date = parsedDate;
-    } else {
-      return res.status(400).json({ error: "Invalid date format" });
-    }
-  } else {
-    incomeData.date = new Date();
+    return res.status(400).json({ error: "Invalid date format" });
   }
 
   try {
@@ -41,14 +33,6 @@ export const createIncome = asyncHandler(async (req, res) => {
     res.status(201).json(income);
   } catch (error) {
     console.error("Error creating income:", error);
-
-    if (
-      error.message.includes("category") ||
-      error.message.includes("Category")
-    ) {
-      return res.status(400).json({ error: "Invalid category specified" });
-    }
-
     res.status(500).json({ error: "Failed to create income" });
   }
 });
@@ -129,19 +113,6 @@ export const updateIncome = asyncHandler(async (req, res) => {
     updates.date = parsedDate;
   }
 
-  if (updates.category_id !== undefined) {
-    if (updates.category_id === null || updates.category_id === "") {
-      updates.category = { connect: { category_id: 1 } };
-    } else {
-      const categoryId = parseInt(updates.category_id);
-      if (isNaN(categoryId)) {
-        return res.status(400).json({ error: "Invalid category ID" });
-      }
-      updates.category = { connect: { category_id: categoryId } };
-    }
-    delete updates.category_id;
-  }
-
   try {
     const income = await incomeService.updateIncome(
       id,
@@ -161,13 +132,6 @@ export const updateIncome = asyncHandler(async (req, res) => {
         .json({ error: "Income not found or not authorized" });
     }
 
-    if (
-      error.message.includes("category") ||
-      error.message.includes("Category")
-    ) {
-      return res.status(400).json({ error: "Invalid category specified" });
-    }
-
     res.status(500).json({ error: "Failed to update income" });
   }
 });
@@ -197,122 +161,3 @@ export const deleteIncome = asyncHandler(async (req, res) => {
     res.status(500).json({ error: "Failed to delete income" });
   }
 });
-
-//---------------INCOME CATEGORIES---------------//
-
-export const getIncomeCategories = asyncHandler(async (req, res) => {
-  try {
-    const categories = await incomeService.getIncomeCategories(
-      req.user.user_id
-    );
-    res.json(categories);
-  } catch (error) {
-    console.error("Error fetching income categories:", error);
-    res.status(500).json({ error: "Failed to fetch income categories" });
-  }
-});
-
-export const getIncomeCategoriesByUser = asyncHandler(async (req, res) => {
-  try {
-    const categories = await incomeService.getIncomeCategoriesByUser(
-      req.user.user_id
-    );
-    res.json(categories);
-  } catch (error) {
-    console.error("Error fetching user income categories:", error);
-    res.status(500).json({ error: "Failed to fetch user income categories" });
-  }
-});
-
-export const createIncomeCategory = asyncHandler(async (req, res) => {
-  try {
-    const { category_name, icon_url, icon_emoji } = req.body;
-
-    if (!category_name) {
-      return res.status(400).json({ error: "Category name is required" });
-    }
-
-    const category = await incomeService.createIncomeCategory(
-      req.user.user_id,
-      {
-        category_name,
-        icon_url,
-        icon_emoji,
-      }
-    );
-    res.status(201).json(category);
-  } catch (error) {
-    console.error("Error creating income category:", error);
-
-    if (error.message.includes("already exists")) {
-      return res.status(409).json({ error: error.message });
-    }
-
-    res.status(500).json({ error: "Failed to create income category" });
-  }
-});
-
-export const updateIncomeCategory = asyncHandler(async (req, res) => {
-  try {
-    const { id } = req.params;
-    const { category_name, icon_url, icon_emoji } = req.body;
-
-    if (!category_name) {
-      return res.status(400).json({ error: "Category name is required" });
-    }
-
-    if (!id || isNaN(parseInt(id))) {
-      return res.status(400).json({ error: "Invalid category ID" });
-    }
-
-    const category = await incomeService.updateIncomeCategory(
-      id,
-      req.user.user_id,
-      { category_name, icon_url, icon_emoji }
-    );
-    res.json(category);
-  } catch (error) {
-    console.error("Error updating income category:", error);
-
-    if (
-      error.message.includes("not found") ||
-      error.message.includes("not authorized")
-    ) {
-      return res.status(404).json({ error: error.message });
-    }
-
-    if (error.message.includes("already exists")) {
-      return res.status(409).json({ error: error.message });
-    }
-
-    res.status(500).json({ error: "Failed to update income category" });
-  }
-});
-
-export const deleteIncomeCategory = asyncHandler(async (req, res) => {
-  try {
-    const { id } = req.params;
-
-    if (!id || isNaN(parseInt(id))) {
-      return res.status(400).json({ error: "Invalid category ID" });
-    }
-
-    await incomeService.deleteIncomeCategory(id, req.user.user_id);
-    res.status(204).send();
-  } catch (error) {
-    console.error("Error deleting income category:", error);
-
-    if (
-      error.message.includes("not found") ||
-      error.message.includes("not authorized")
-    ) {
-      return res.status(404).json({ error: error.message });
-    }
-
-    if (error.message.includes("being used")) {
-      return res.status(409).json({ error: error.message });
-    }
-
-    res.status(500).json({ error: "Failed to delete income category" });
-  }
-});
diff --git a/server/docs/Expense Tracker API.yaml b/server/docs/Expense Tracker API.yaml
index 5564428..be252b6 100644
--- a/server/docs/Expense Tracker API.yaml	
+++ b/server/docs/Expense Tracker API.yaml	
@@ -143,67 +143,15 @@ paths:
           description: Expense updated
     delete:
       summary: Delete an expense
+      parameters:
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: string
       responses:
         "204":
           description: Expense deleted
-  /incomes/categories:
-    get:
-      summary: Get system income categories
-      responses:
-        "200":
-          description: List of system income categories
-  /incomes/custom-categories:
-    get:
-      summary: Get user's custom income categories
-      responses:
-        "200":
-          description: List of user's custom income categories
-    post:
-      summary: Create a new custom income category
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              required: [category_name]
-              properties:
-                category_name:
-                  type: string
-                icon_url:
-                  type: string
-      responses:
-        "201":
-          description: Income category created
-  /incomes/custom-categories/{id}:
-    parameters:
-      - in: path
-        name: id
-        required: true
-        schema:
-          type: string
-    put:
-      summary: Update an income category
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              required: [category_name]
-              properties:
-                category_name:
-                  type: string
-                icon_url:
-                  type: string
-      responses:
-        "200":
-          description: Income category updated
-    delete:
-      summary: Delete an income category
-      responses:
-        "204":
-          description: Income category deleted
   /incomes:
     get:
       summary: List all incomes
@@ -226,7 +174,7 @@ paths:
           application/json:
             schema:
               type: object
-              required: [amount]
+              required: [amount, date]
               properties:
                 amount:
                   type: number
@@ -236,8 +184,6 @@ paths:
                   type: string
                 description:
                   type: string
-                category_id:
-                  type: number
       responses:
         "201":
           description: Income created
@@ -275,6 +221,12 @@ paths:
           description: Income updated
     delete:
       summary: Delete an income entry
+      parameters:
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: string
       responses:
         "204":
           description: Income deleted
@@ -301,14 +253,14 @@ paths:
           description: Category created
 
   /categories/{id}:
-    parameters:
-      - in: path
-        name: id
-        required: true
-        schema:
-          type: string
     put:
       summary: Rename a category
+      parameters:
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: string
       requestBody:
         content:
           application/json:
@@ -322,6 +274,12 @@ paths:
           description: Category updated
     delete:
       summary: Delete a category
+      parameters:
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: string
       responses:
         "204":
           description: Category deleted
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index 7f9dd94..7235f00 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -14,62 +14,48 @@ datasource db {
 }
 
 model User {
-  user_id           Int              @id @default(autoincrement())
-  username          String           @db.VarChar(50)
-  email             String           @unique @db.VarChar(255)
-  hashed_password   String           @db.VarChar(255)
-  firstname         String           @db.VarChar(100)
-  lastname          String           @db.VarChar(100)
-  created_at        DateTime         @default(now())
-  updated_at        DateTime         @updatedAt
-  expenses          Expense[]
-  incomes           Income[]
-  expense_categories ExpenseCategory[]
-  income_categories IncomeCategory[]
+  user_id         Int      @id @default(autoincrement())
+  username        String?  @db.VarChar(50)
+  email           String   @unique @db.VarChar(255)
+  hashed_password String   @db.VarChar(255)
+  firstname       String?  @db.VarChar(100)
+  lastname        String?  @db.VarChar(100)
+  created_at      DateTime @default(now())
+  updated_at      DateTime @updatedAt
+
+  expenses   Expense[]
+  incomes    Income[]
+  categories ExpenseCategory[]
 
   @@map("user")
 }
 
 model ExpenseCategory {
-  category_id   Int      @id @default(autoincrement())
-  category_name String   @db.VarChar(50)
-  icon_url      String?  @db.VarChar(500)
-  is_custom     Boolean  @default(false)
-  user_id       Int?
-  user          User?    @relation(fields: [user_id], references: [user_id], onDelete: Cascade)
-  expenses      Expense[]
-  created_at    DateTime @default(now())
-  updated_at    DateTime @updatedAt
-
-  @@map("expense_category")
-}
-
-model IncomeCategory {
   category_id   Int       @id @default(autoincrement())
   category_name String    @db.VarChar(50)
   icon_url      String?   @db.VarChar(500)
   is_custom     Boolean   @default(false)
   user_id       Int?
   user          User?     @relation(fields: [user_id], references: [user_id], onDelete: Cascade)
-  incomes       Income[]
+  expenses      Expense[]
   created_at    DateTime  @default(now())
   updated_at    DateTime  @updatedAt
 
-  @@map("income_category")
+  @@map("expense_category")
 }
 
 model Expense {
-  expense_id     Int      @id @default(autoincrement())
+  expense_id     Int             @id @default(autoincrement())
   amount         Float
-  description    String?  @db.VarChar(2000)
-  type           String   @default("ONE_TIME") @db.VarChar(20)
-  receipt_upload String?  @db.VarChar(2000)
-  creation_date  DateTime @default(now())
+  description    String?         @db.VarChar(2000)
+  type           String          @default("ONE_TIME") @db.VarChar(20)
+  receipt_upload String?         @db.VarChar(2000)
+  creation_date  DateTime        @default(now())
   expense_date   DateTime?
   start_date     DateTime?
   end_date       DateTime?
   user_id        Int
-  user           User     @relation(fields: [user_id], references: [user_id], onDelete: Cascade)
+  user           User            @relation(fields: [user_id], references: [user_id], onDelete: Cascade)
   category_id    Int
   category       ExpenseCategory @relation(fields: [category_id], references: [category_id], onDelete: Cascade)
 
@@ -77,16 +63,20 @@ model Expense {
 }
 
 model Income {
-  income_id      Int      @id @default(autoincrement())
-  amount         Float
-  date           DateTime @default(now())
-  source         String   @db.VarChar(100)
-  description    String?  @db.VarChar(2000)
-  creation_date  DateTime @default(now())
-  user_id        Int
-  user           User     @relation(fields: [user_id], references: [user_id], onDelete: Cascade)
-  category_id    Int
-  category       IncomeCategory @relation(fields: [category_id], references: [category_id], onDelete: Cascade)
+  income_id     Int      @id @default(autoincrement()) @map("id")
+  amount        Float
+  date          DateTime @default(now())
+  source        String?  @db.VarChar(100)
+  description   String?  @db.VarChar(2000)
+  creation_date DateTime @default(now())
+
+  user_id Int
+  user    User @relation(fields: [user_id], references: [user_id], onDelete: Cascade)
 
   @@map("income")
 }
+
+enum ExpenseType {
+  ONE_TIME
+  RECURRING
+}
diff --git a/server/routes/income.route.js b/server/routes/income.route.js
index 32e8cc8..9495e6c 100644
--- a/server/routes/income.route.js
+++ b/server/routes/income.route.js
@@ -1,22 +1,19 @@
-import { Router } from 'express';
-import { createIncome, getIncomes, getIncome, updateIncome, deleteIncome, getIncomeCategories, getIncomeCategoriesByUser,createIncomeCategory, updateIncomeCategory, deleteIncomeCategory } from '../controllers/income.controller.js';
+import { Router } from "express";
+import {
+  createIncome,
+  getIncomes,
+  getIncome,
+  updateIncome,
+  deleteIncome,
+} from "../controllers/income.controller.js";
 
 const router = Router();
 
-//INCOME CATEGORY
-router.get('/categories', getIncomeCategories);
-router.get('/custom-categories', getIncomeCategoriesByUser)
-router.post('/custom-categories', createIncomeCategory);
-router.put('/custom-categories/:id', updateIncomeCategory);
-router.delete('/custom-categories/:id', deleteIncomeCategory);
+// INCOME ROUTES
+router.get("/", getIncomes);
+router.get("/:id", getIncome);
+router.post("/", createIncome);
+router.put("/:id", updateIncome);
+router.delete("/:id", deleteIncome);
 
-//INCOME
-router.get('/', getIncomes);
-router.get('/:id', getIncome);
-router.post('/', createIncome);
-router.put('/:id', updateIncome);
-router.delete('/:id', deleteIncome);
-
-
-
-export default router;
\ No newline at end of file
+export default router;
diff --git a/server/server.js b/server/server.js
index 67dd472..2cda785 100644
--- a/server/server.js
+++ b/server/server.js
@@ -20,7 +20,6 @@ app.use(cors({
 app.use(express.json());
 app.use(cookieParser());
 
-
 app.use('/api/auth', authRoutes);
 app.use('/api/incomes', requireAuth, incomeRoutes);
 app.use('/api/categories', categoryRoutes);
diff --git a/server/services/income.service.js b/server/services/income.service.js
index d285487..b353139 100644
--- a/server/services/income.service.js
+++ b/server/services/income.service.js
@@ -3,19 +3,18 @@ import { prisma } from "../db/prisma.js";
 //---------------INCOME---------------//
 
 //POST
-const createIncome = async (userId, data) => {
+const createIncome = async (user_id, data) => {
   return await prisma.income.create({
     data: {
       ...data,
-      user: { connect: { user_id: userId } },
+      user: { connect: { user_id } },
     },
-    include: { category: true },
   });
 };
 
 //GET ALL (with start and end date query params)
-const getIncomes = async (userId, filters = {}) => {
-  const where = { user_id: userId };
+const getIncomes = async (user_id, filters = {}) => {
+  const where = { user_id };
 
   if (filters.start || filters.end) {
     where.date = {};
@@ -25,26 +24,21 @@ const getIncomes = async (userId, filters = {}) => {
 
   return await prisma.income.findMany({
     where,
-    include: { category: true },
-    orderBy: [
-      { date: "desc" },
-      { creation_date: "desc" }, // might change { income_id: "desc" } if that doesnt work
-    ],
+    orderBy: [{ date: "desc" }, { createdAt: "desc" }],
   });
 };
 
 //GET BY ID
-const getIncomeById = async (id, userId) => {
+const getIncomeById = async (id, user_id) => {
   return await prisma.income.findFirst({
-    where: { income_id: parseInt(id), user_id: userId },
-    include: { category: true },
+    where: { income_id: parseInt(id), user_id },
   });
 };
 
 //UPDATE
-const updateIncome = async (id, userId, data) => {
+const updateIncome = async (id, user_id, data) => {
   const income = await prisma.income.findFirst({
-    where: { income_id: parseInt(id), user_id: userId },
+    where: { income_id: parseInt(id), user_id },
   });
 
   if (!income) {
@@ -54,14 +48,13 @@ const updateIncome = async (id, userId, data) => {
   return await prisma.income.update({
     where: { income_id: parseInt(id) },
     data,
-    include: { category: true },
   });
 };
 
 //DELETE
-const deleteIncome = async (id, userId) => {
+const deleteIncome = async (id, user_id) => {
   const income = await prisma.income.findFirst({
-    where: { income_id: parseInt(id), user_id: userId },
+    where: { income_id: parseInt(id), user_id },
   });
 
   if (!income) {
@@ -73,112 +66,10 @@ const deleteIncome = async (id, userId) => {
   });
 };
 
-//---------------INCOME CATEGORY---------------//
-
-//GET ALL
-const getIncomeCategories = async (userId) => {
-  return await prisma.incomeCategory.findMany({
-    where: {
-      OR: [{ user_id: null }, { user_id: userId }],
-    },
-    orderBy: [{ is_custom: "asc" }, { category_name: "asc" }],
-  });
-};
-
-//GET ALL BY USER
-const getIncomeCategoriesByUser = async (userId) => {
-  return await prisma.incomeCategory.findMany({
-    where: {
-      user_id: userId,
-    },
-    orderBy: [{ is_custom: "asc" }, { category_name: "asc" }],
-  });
-};
-
-//POST
-const createIncomeCategory = async (userId, data) => {
-  const existingCategory = await prisma.incomeCategory.findFirst({
-    where: {
-      category_name: data.category_name,
-      user_id: userId,
-    },
-  });
-
-  if (existingCategory) {
-    throw new Error("Category already exists");
-  }
-
-  return await prisma.incomeCategory.create({
-    data: {
-      ...data,
-      is_custom: true,
-      user: { connect: { user_id: userId } },
-    },
-  });
-};
-
-//UPDATE
-const updateIncomeCategory = async (id, userId, data) => {
-  const category = await prisma.incomeCategory.findFirst({
-    where: { category_id: parseInt(id), user_id: userId },
-  });
-
-  if (!category) {
-    throw new Error("Category not found or not authorized");
-  }
-
-  if (data.category_name) {
-    const duplicateCategory = await prisma.incomeCategory.findFirst({
-      where: {
-        category_name: data.category_name,
-        user_id: userId,
-        NOT: { category_id: parseInt(id) },
-      },
-    });
-
-    if (duplicateCategory) {
-      throw new Error("Category name already exists");
-    }
-  }
-
-  return await prisma.incomeCategory.update({
-    where: { category_id: parseInt(id) },
-    data,
-  });
-};
-
-//DELETE
-const deleteIncomeCategory = async (id, userId) => {
-  const category = await prisma.incomeCategory.findFirst({
-    where: { category_id: parseInt(id), user_id: userId },
-  });
-
-  if (!category) {
-    throw new Error("Category not found or not authorized");
-  }
-
-  const incomesUsingCategory = await prisma.income.count({
-    where: { category_id: parseInt(id) },
-  });
-
-  if (incomesUsingCategory > 0) {
-    throw new Error("Cannot delete category that is being used by incomes");
-  }
-
-  await prisma.incomeCategory.delete({
-    where: { category_id: parseInt(id) },
-  });
-};
-
 export default {
   createIncome,
   getIncomes,
   getIncomeById,
   updateIncome,
   deleteIncome,
-  getIncomeCategories,
-  createIncomeCategory,
-  getIncomeCategoriesByUser,
-  updateIncomeCategory,
-  deleteIncomeCategory,
 };