diff --git a/admin/calendar.php b/admin/calendar.php
index e02dde94..a3256299 100644
--- a/admin/calendar.php
+++ b/admin/calendar.php
@@ -207,7 +207,9 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                             echo '<option value="">'.$hesklang['select'].'</option>';
                                         }
                                         foreach ($categories as $category): ?>
-                                            <option value="<?php echo $category['id']; ?>" data-color="<?php echo htmlspecialchars($category['color']); ?>">
+                                            <option value="<?php echo $category['id']; ?>" data-background-color="<?php echo htmlspecialchars($category['background_color']); ?>"
+                                                data-foreground-color="<?php echo htmlspecialchars($category['foreground_color']); ?>"
+                                                data-display-border="<?php echo htmlspecialchars($category['display_border_outline']); ?>">
                                                 <?php echo $category['name']; ?>
                                             </option>
                                         <?php endforeach; ?>
@@ -377,7 +379,9 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                             echo '<option value="">'.$hesklang['select'].'</option>';
                                         }
                                         foreach ($categories as $category): ?>
-                                            <option value="<?php echo $category['id']; ?>" data-color="<?php echo $category['color']; ?>">
+                                            <option value="<?php echo $category['id']; ?>" data-background-color="<?php echo htmlspecialchars($category['background_color']); ?>"
+                                                    data-foreground-color="<?php echo htmlspecialchars($category['foreground_color']); ?>"
+                                                    data-display-border="<?php echo htmlspecialchars($category['display_border_outline']); ?>">
                                                 <?php echo $category['name']; ?>
                                             </option>
                                         <?php endforeach; ?>
diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js
index 0e13b44e..e4bbb699 100644
--- a/js/calendar/mods-for-hesk-calendar.js
+++ b/js/calendar/mods-for-hesk-calendar.js
@@ -204,7 +204,9 @@ $(document).ready(function() {
             categoryId: $createForm.find('select[name="category"]').val(),
             action: 'create',
             type: 'CALENDAR',
-            categoryColor: $createForm.find('select[name="category"] :selected').attr('data-color'),
+            backgroundColor: $createForm.find('select[name="category"] :selected').attr('data-background-color'),
+            foregroundColor: $createForm.find('select[name="category"] :selected').attr('data-foreground-color'),
+            displayBorder: $createForm.find('select[name="category"] :selected').attr('data-display-border'),
             categoryName: $createForm.find('select[name="category"] :selected').text().trim(),
             reminderValue: $createForm.find('input[name="reminder-value"]').val(),
             reminderUnits: $createForm.find('select[name="reminder-unit"]').val()
@@ -249,7 +251,9 @@ $(document).ready(function() {
             allDay: allDay,
             comments: $form.find('textarea[name="comments"]').val(),
             categoryId: $form.find('select[name="category"]').val(),
-            categoryColor: $form.find('select[name="category"] :selected').attr('data-color'),
+            backgroundColor: $form.find('select[name="category"] :selected').attr('data-background-color'),
+            foregroundColor: $form.find('select[name="category"] :selected').attr('data-foreground-color'),
+            displayBorder: $form.find('select[name="category"] :selected').attr('data-display-border'),
             categoryName: $form.find('select[name="category"] :selected').text().trim(),
             action: 'update',
             reminderValue: $form.find('input[name="reminder-value"]').val(),