diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fc90a83..d84cd6ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ This file documents all notable changes made to ITFlow.
 - Table Lists: replace class table-responsive-sm with just table-reponsive was causing ui issues with certain screen sizes.
 - Client: Fix Edit erroring on certain characters.
 - Category: Fix Add/Edit due to missing CSRF fields.
+- Category: Fix Restore function and Icon and text color.
 - Invoice: Do not apply late fee on first overdue reminder (1 day).
 - Ticket: Fix issue with contact not being added with Add contact modal v1.
 - Quote: Fix Copy was missing client.
diff --git a/admin/settings_theme.php b/admin/settings_theme.php
index 80957ff1..6e5cc6a5 100644
--- a/admin/settings_theme.php
+++ b/admin/settings_theme.php
@@ -1,68 +1,90 @@
 <?php
 require_once "includes/inc_all_admin.php";
- ?>
 
-    <div class="card card-dark">
-        <div class="card-header py-3">
-            <h3 class="card-title"><i class="fas fa-fw fa-paint-brush mr-2"></i>Theme</h3>
-        </div>
-        <div class="card-body">
-            <form action="post.php" method="post" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+$theme_colors_array = array (
+    'lightblue',
+    'blue',
+    'cyan',
+    'green',
+    'olive',
+    'teal',
+    'red',
+    'maroon',
+    'pink',
+    'purple',
+    'indigo',
+    'fuchsia',
+    'yellow',
+    'orange',
+    'yellow',
+    'black',
+    'navy',
+    'gray'
+);
 
-                <label>Select a Theme</label>
-                <div class="form-row">
+?>
 
-                    <?php
+<div class="card card-dark">
+    <div class="card-header py-3">
+        <h3 class="card-title"><i class="fas fa-fw fa-paint-brush mr-2"></i>Theme</h3>
+    </div>
+    <div class="card-body">
+        <form action="post.php" method="post" autocomplete="off">
+            <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
-                    foreach ($theme_colors_array as $theme_color) {
+            <label>Select a Theme</label>
+            <div class="form-row">
 
-                        ?>
+                <?php
 
-                        <div class="col-4 text-center mb-3">
-                            <div class="form-group">
-                                <div class="custom-control custom-radio">
-                                    <input class="custom-control-input" type="radio" onchange="this.form.submit()" id="customRadio<?php echo $theme_color; ?>" name="edit_theme_settings" value="<?php echo $theme_color; ?>" <?php if ($config_theme == $theme_color) { echo "checked"; } ?>>
-                                    <label for="customRadio<?php echo $theme_color; ?>" class="custom-control-label">
-                                        <i class="fa fa-fw fa-6x fa-circle text-<?php echo $theme_color; ?>"></i>
-                                        <br>
-                                        <?php echo $theme_color; ?>
-                                    </label>
-                                </div>
+                foreach ($theme_colors_array as $theme_color) {
+
+                    ?>
+
+                    <div class="col-4 text-center mb-3">
+                        <div class="form-group">
+                            <div class="custom-control custom-radio">
+                                <input class="custom-control-input" type="radio" onchange="this.form.submit()" id="customRadio<?php echo $theme_color; ?>" name="edit_theme_settings" value="<?php echo $theme_color; ?>" <?php if ($config_theme == $theme_color) { echo "checked"; } ?>>
+                                <label for="customRadio<?php echo $theme_color; ?>" class="custom-control-label">
+                                    <i class="fa fa-fw fa-6x fa-circle text-<?php echo $theme_color; ?>"></i>
+                                    <br>
+                                    <?php echo $theme_color; ?>
+                                </label>
                             </div>
                         </div>
+                    </div>
 
-                    <?php } ?>
-
-                </div>
-
-            </form>
-        </div>
-    </div>
-
-    <div class="card card-dark">
-        <div class="card-header py-3">
-            <h3 class="card-title"><i class="fas fa-fw fa-image mr-2"></i>Favicon</h3>
-        </div>
-        <div class="card-body">
-            <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
-                <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-
-                <img class="mb-3" src="<?php if(file_exists("../uploads/favicon.ico")) { echo "../uploads/favicon.ico"; } else { echo "../favicon.ico"; } ?>">
-
-                <div class="form-group">
-                    <input type="file" class="form-control-file" name="file" accept=".ico">
-                </div>
-
-                <hr>
-
-                <button type="submit" name="edit_favicon_settings" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Upload Icon</button>
-                <?php if(file_exists("../uploads/favicon.ico")) { ?>
-                <a href="post.php?reset_favicon&csrf_token=<?= $_SESSION['csrf_token'] ?>" class="btn btn-outline-danger"><i class="fas fa-redo-alt mr-2"></i>Reset Favicon</a>
                 <?php } ?>
-            </form>
-        </div>
+
+            </div>
+
+        </form>
     </div>
+</div>
+
+<div class="card card-dark">
+    <div class="card-header py-3">
+        <h3 class="card-title"><i class="fas fa-fw fa-image mr-2"></i>Favicon</h3>
+    </div>
+    <div class="card-body">
+        <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
+            <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
+
+            <img class="mb-3" src="<?php if(file_exists("../uploads/favicon.ico")) { echo "../uploads/favicon.ico"; } else { echo "../favicon.ico"; } ?>">
+
+            <div class="form-group">
+                <input type="file" class="form-control-file" name="file" accept=".ico">
+            </div>
+
+            <hr>
+
+            <button type="submit" name="edit_favicon_settings" class="btn btn-primary text-bold"><i class="fa fa-check mr-2"></i>Upload Icon</button>
+            <?php if(file_exists("../uploads/favicon.ico")) { ?>
+            <a href="post.php?reset_favicon&csrf_token=<?= $_SESSION['csrf_token'] ?>" class="btn btn-outline-danger"><i class="fas fa-redo-alt mr-2"></i>Reset Favicon</a>
+            <?php } ?>
+        </form>
+    </div>
+</div>
 
 <?php
 require_once "../includes/footer.php";
diff --git a/agent/project_details.php b/agent/project_details.php
index bf74e708..2b8940e6 100644
--- a/agent/project_details.php
+++ b/agent/project_details.php
@@ -341,13 +341,13 @@ if (isset($_GET['project_id'])) {
                 <div class="card-body p-0">
                     <form id="bulkActions" action="post.php" method="post">
                         <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
-                        <div class="table-responsive-sm">
+                        <div class="table-responsive">
                             <table class="table table-border table-hover">
                                 <thead class="thead-light">
                                 <tr>
                                     <td class="bg-light checkbox-column">
                                         <div class="form-check">
-                                            <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)" onkeydown="checkAll(this)">
+                                            <input class="form-check-input" id="selectAllCheckbox" type="checkbox" onclick="checkAll(this)">
                                         </div>
                                     </td>
                                     <th>
@@ -494,7 +494,6 @@ if (isset($_GET['project_id'])) {
                                         <td><?php echo $client_name; ?></td>
                                     </tr>
 
-
                                 <?php } ?>
 
                                 </tbody>
diff --git a/includes/load_global_settings.php b/includes/load_global_settings.php
index a496f634..3cd7829f 100644
--- a/includes/load_global_settings.php
+++ b/includes/load_global_settings.php
@@ -135,28 +135,6 @@ $config_whitelabel_key = $row['config_whitelabel_key'];
 
 
 // Select Arrays
-
-$theme_colors_array = array (
-    'lightblue',
-    'blue',
-    'cyan',
-    'green',
-    'olive',
-    'teal',
-    'red',
-    'maroon',
-    'pink',
-    'purple',
-    'indigo',
-    'fuchsia',
-    'yellow',
-    'orange',
-    'yellow',
-    'black',
-    'navy',
-    'gray'
-);
-
 $colors_array = array (
     'lightblue',
     'blue',
@@ -214,7 +192,12 @@ $asset_types_array = array (
 
 $license_types_array = array (
     'Device',
-    'User'
+    'User',
+    'Site',
+    'Concurrent',
+    'Trial',
+    'Perpetual',
+    'Usage-based'
 );
 
 $document_types_array = array (