diff --git a/categories.php b/categories.php
index fd14a4a4..c578068a 100644
--- a/categories.php
+++ b/categories.php
@@ -15,17 +15,21 @@ if (isset($_GET['category'])) {
 //Rebuild URL
 $url_query_strings_sort = http_build_query($get_copy);
 
+
 $sql = mysqli_query(
     $mysqli,
     "SELECT SQL_CALC_FOUND_ROWS * FROM categories
     WHERE category_name LIKE '%$q%'
     AND category_type = '$category'
-    AND category_archived_at IS NULL
+    AND category_$archive_query
     ORDER BY $sort $order LIMIT $record_from, $record_to"
 );
-
 $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
+if (isset($_GET['archived'])) {
+    $category = "Archived";
+}
+
 $colors_used_array = [];
 
 //Colors Used
@@ -33,7 +37,7 @@ $sql_colors_used = mysqli_query(
     $mysqli,
     "SELECT category_color FROM categories 
     WHERE category_type = '$category'
-    AND category_archived_at IS NULL"
+    AND category_$archive_query"
 );
 
 while ($color_used_row = mysqli_fetch_array($sql_colors_used)) {
@@ -44,46 +48,91 @@ $colors_diff = array_diff($colors_array, $colors_used_array);
 ?>
 
 
-    <div class="card card-dark">
-        <div class="card-header py-2">
-            <h3 class="card-title mt-2"><i class="fa fa-fw fa-list-ul mr-2"></i><?php echo nullable_htmlentities($category); ?> Categories</h3>
-            <div class="card-tools">
-                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCategoryModal"><i class="fas fa-plus mr-2"></i>Create</button>
-            </div>
+<div class="card card-dark">
+    <div class="card-header py-2">
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-list-ul mr-2"></i>
+            <?php echo nullable_htmlentities($category); ?> Categories
+        </h3>
+        <?php
+            if (!isset($_GET['archived'])) {
+        ?>
+        <div class="card-tools">
+            <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCategoryModal"><i
+                    class="fas fa-plus mr-2"></i>Create</button>
         </div>
-        <div class="card-body">
-            <form autocomplete="off">
-                <input type="hidden" name="category" value="<?php echo nullable_htmlentities($category); ?>">
-                <div class="row">
-                    <div class="col-sm-4 mb-2">
-                        <div class="input-group">
-                            <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Categories">
-                            <div class="input-group-append">
-                                <button class="btn btn-primary"><i class="fa fa-search"></i></button>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-sm-8">
-                        <div class="btn-group float-right">
-                            <a href="?category=Expense" class="btn <?php if ($category == 'Expense') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>">Expense</a>
-                            <a href="?category=Income" class="btn <?php if ($category == 'Income') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>">Income</a>
-                            <a href="?category=Referral" class="btn <?php if ($category == 'Referral') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>">Referral</a>
-                            <a href="?category=Payment Method" class="btn <?php if ($category == 'Payment Method') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>">Payment Method</a>
+        <?php
+            }
+        ?>
+    </div>
+    <div class="card-body">
+        <form autocomplete="off">
+            <input type="hidden" name="category" value="<?php echo nullable_htmlentities($category); ?>">
+            <div class="row">
+                <div class="col-sm-4 mb-2">
+                    <div class="input-group">
+                        <input type="search" class="form-control" name="q"
+                            value="<?php if (isset($q)) {
+                                echo stripslashes(nullable_htmlentities($q));
+                            } ?>"
+                            placeholder="Search Categories">
+                        <div class="input-group-append">
+                            <button class="btn btn-primary"><i class="fa fa-search"></i></button>
                         </div>
                     </div>
                 </div>
-            </form>
-            <hr>
-            <div class="table-responsive-sm">
-                <table class="table table-striped table-borderless table-hover">
-                    <thead class="text-dark <?php if ($num_rows[0] == 0) { echo "d-none"; } ?>">
+                <div class="col-sm-8">
+                    <div class="btn-group float-right">
+                        <a href="?category=Expense"
+                            class="btn <?php if ($category == 'Expense') {
+                                echo 'btn-primary';
+                            } else {
+                                echo 'btn-default';
+                            } ?>">Expense</a>
+                        <a href="?category=Income"
+                            class="btn <?php if ($category == 'Income') {
+                                echo 'btn-primary';
+                            } else {
+                                echo 'btn-default';
+                            } ?>">Income</a>
+                        <a href="?category=Referral"
+                            class="btn <?php if ($category == 'Referral') {
+                                echo 'btn-primary';
+                            } else {
+                                echo 'btn-default';
+                            } ?>">Referral</a>
+                        <a href="?category=Payment Method"
+                            class="btn <?php if ($category == 'Payment Method') {
+                                echo 'btn-primary';
+                            } else {
+                                echo 'btn-default';
+                            } ?>">Payment
+                            Method</a>
+                        <a href="?archived=1"
+                            class="btn <?php if (isset($_GET['archived'])) {
+                                echo 'btn-primary';
+                            } else {
+                                echo 'btn-default';
+                            } ?>"><i
+                                class="fas fa-fw fa-archive mr-2"></i>Archived</a>
+                    </div>
+                </div>
+            </div>
+        </form>
+        <hr>
+        <div class="table-responsive-sm">
+            <table class="table table-striped table-borderless table-hover">
+                <thead class="text-dark <?php if ($num_rows[0] == 0) {
+                    echo "d-none";
+                } ?>">
                     <tr>
-                        <th><a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=category_name&order=<?php echo $disp; ?>">Name</a></th>
+                        <th><a class="text-dark"
+                                href="?<?php echo $url_query_strings_sort; ?>&sort=category_name&order=<?php echo $disp; ?>">Name</a>
+                        </th>
                         <th>Color</th>
                         <th class="text-center">Action</th>
                     </tr>
-                    </thead>
-                    <tbody>
+                </thead>
+                <tbody>
                     <?php
 
                     while ($row = mysqli_fetch_array($sql)) {
@@ -91,10 +140,13 @@ $colors_diff = array_diff($colors_array, $colors_used_array);
                         $category_name = nullable_htmlentities($row['category_name']);
                         $category_color = nullable_htmlentities($row['category_color']);
                         //$colors_used_array[] = $row['category_color'];
-
+                    
                         ?>
                         <tr>
-                            <td><a class="text-dark" href="#" data-toggle="modal" data-target="#editCategoryModal<?php echo $category_id; ?>"><?php echo $category_name; ?></a></td>
+                            <td><a class="text-dark" href="#" data-toggle="modal"
+                                    data-target="#editCategoryModal<?php echo $category_id; ?>">
+                                    <?php echo $category_name; ?>
+                                </a></td>
                             <td><i class="fa fa-3x fa-circle" style="color:<?php echo $category_color; ?>;"></i></td>
                             <td>
                                 <div class="dropdown dropleft text-center">
@@ -102,13 +154,31 @@ $colors_diff = array_diff($colors_array, $colors_used_array);
                                         <i class="fas fa-ellipsis-h"></i>
                                     </button>
                                     <div class="dropdown-menu">
-                                        <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editCategoryModal<?php echo $category_id; ?>">
-                                            <i class="fas fa-fw fa-edit mr-2"></i>Edit
-                                        </a>
-                                        <div class="dropdown-divider"></div>
-                                        <a class="dropdown-item text-danger confirm-link" href="post.php?archive_category=<?php echo $category_id; ?>">
-                                            <i class="fas fa-fw fa-archive mr-2"></i>Archive
-                                        </a>
+                                        <?php
+                                        if ($category == "Archived") {
+                                            ?>
+                                            <a class="dropdown-item text-success confirm-link"
+                                                href="post.php?unarchive_category=<?php echo $category_id; ?>">
+                                                <i class="fas fa-fw fa-archive mr-2"></i>Unarchive
+                                            </a>
+                                            <a class="dropdown-item text-danger confirm-link"
+                                                href="post.php?delete_category=<?php echo $category_id; ?>">
+                                                <i class="fas fa-fw fa-trash mr-2"></i>Delete
+                                            </a>
+                                            <?php
+                                        } else {
+                                            ?>
+                                            <a class="dropdown-item" href="#" data-toggle="modal"
+                                                data-target="#editCategoryModal<?php echo $category_id; ?>">
+                                                <i class="fas fa-fw fa-edit mr-2"></i>Edit
+                                            </a>
+                                            <a class="dropdown-item text-danger confirm-link"
+                                                href="post.php?archive_category=<?php echo $category_id; ?>">
+                                                <i class="fas fa-fw fa-archive mr-2"></i>Archive
+                                            </a>
+                                            <?php
+                                        }
+                                        ?>
                                     </div>
                                 </div>
                             </td>
@@ -117,20 +187,20 @@ $colors_diff = array_diff($colors_array, $colors_used_array);
                         <?php
 
                         //$colors_diff = array_diff($colors_array,$colors_used_array);
-
+                    
                         include("category_edit_modal.php");
 
                     }
 
                     ?>
 
-                    </tbody>
-                </table>
-            </div>
-            <?php require_once("pagination.php"); ?>
+                </tbody>
+            </table>
         </div>
+        <?php require_once("pagination.php"); ?>
     </div>
+</div>
 
 <?php
 require_once("category_add_modal.php");
-require_once("footer.php");
+require_once("footer.php");
\ No newline at end of file
diff --git a/post/category.php b/post/category.php
index 13a6c60b..72ec5273 100644
--- a/post/category.php
+++ b/post/category.php
@@ -50,6 +50,20 @@ if (isset($_GET['archive_category'])) {
 
 }
 
+if (isset($_GET['unarchive_category'])) {
+    $category_id = intval($_GET['unarchive_category']);
+
+    mysqli_query($mysqli,"UPDATE categories SET category_archived_at = NULL WHERE category_id = $category_id");
+
+    //logging
+    mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Category', log_action = 'Unarchive', log_description = '$category_id'");
+
+    $_SESSION['alert_message'] = "Category Unarchived";
+
+    header("Location: " . $_SERVER["HTTP_REFERER"]);
+
+}
+
 if (isset($_GET['delete_category'])) {
     $category_id = intval($_GET['delete_category']);