diff --git a/todoblue/src/app/[lang]/board/[board]/(page)/(task)/TaskContainer.module.css b/todoblue/src/app/[lang]/board/[board]/(page)/(task)/TaskContainer.module.css
index e62d42f..e077d83 100644
--- a/todoblue/src/app/[lang]/board/[board]/(page)/(task)/TaskContainer.module.css
+++ b/todoblue/src/app/[lang]/board/[board]/(page)/(task)/TaskContainer.module.css
@@ -3,6 +3,9 @@
     align-items: center;
     min-width: 240px;
     min-height: 48px;
+	border-style: solid;
+	border-width: 0;
+	padding: 8px;
 }
 
 .taskImportanceHighest {
@@ -46,36 +49,31 @@
 }
 
 .taskDeadlineHour {
-    border: 4px hsl(var(--bhsl-current-hue) var(--bhsl-current-saturation) var(--bhsl-current-lightness) / 0.45);
-    padding: 4px;
+    border-left-width: 4px;
+    padding-left: 4px;
 }
 
 .taskDeadlineDay {
-    border: 3px hsl(var(--bhsl-current-hue) var(--bhsl-current-saturation) var(--bhsl-current-lightness) / 0.25);
-    padding: 5px;
+	border-left-width: 3px;
+	padding-left: 5px;
 }
 
 .taskDeadlineWeek {
-    border: 2px hsl(var(--bhsl-current-hue) var(--bhsl-current-saturation) var(--bhsl-current-lightness) / 0.15);
-    padding: 6px;
+	border-left-width: 2px;
+	padding-left: 6px;
 }
 
 .taskDeadlineMonth {
-    border: 1px hsl(var(--bhsl-current-hue) var(--bhsl-current-saturation) var(--bhsl-current-lightness) / 0.15);
-    padding: 7px;
+	border-left-width: 1px;
+	padding-left: 7px;
 }
 
-.taskDeadlineNone {
-    border: 0;
-    padding: 8px;
-}
-
-.taskDeadlineIncoming {
-	border-style: solid;
+.taskDeadlineFuture {
+	border-color: hsl(var(--bhsl-current-hue) var(--bhsl-current-saturation) var(--bhsl-current-lightness) / 0.25);
 }
 
 .taskDeadlinePast {
-	border-style: dashed;
+	border-color: hsl(var(--bhsl-current-hue) var(--bhsl-current-saturation) var(--bhsl-current-lightness) / 1.00);
 }
 
 @keyframes inProgress {
diff --git a/todoblue/src/app/[lang]/board/[board]/(page)/(task)/TaskContainer.tsx b/todoblue/src/app/[lang]/board/[board]/(page)/(task)/TaskContainer.tsx
index 2ca9395..66c7f6c 100644
--- a/todoblue/src/app/[lang]/board/[board]/(page)/(task)/TaskContainer.tsx
+++ b/todoblue/src/app/[lang]/board/[board]/(page)/(task)/TaskContainer.tsx
@@ -34,7 +34,7 @@ export function TaskContainer({role, className, importance, deadline, status, ..
 	        [style.taskDeadlineDay]: deltaAbs !== null && 60 * 60 * 1000 <= deltaAbs && deltaAbs < 24 * 60 * 60 * 1000,
 	        [style.taskDeadlineWeek]: deltaAbs !== null && 24 * 60 * 60 * 1000 <= deltaAbs && deltaAbs < 7 * 24 * 60 * 60 * 1000,
 	        [style.taskDeadlineMonth]: deltaAbs !== null && deltaAbs >= 7 * 24 * 60 * 60 * 1000,
-	        [style.taskDeadlineIncoming]: delta !== null && delta > 0,
+	        [style.taskDeadlineFuture]: delta !== null && delta >= 0,
 	        [style.taskDeadlinePast]: delta !== null && delta < 0,
             [style.taskStatusNonExistent]: status === TaskSimplifiedStatus.NonExistent,
             [style.taskStatusUnfinished]: status === TaskSimplifiedStatus.Unfinished,
diff --git a/todoblue/src/app/[lang]/board/[board]/(page)/(view)/(sorting)/sortingModeToSortingFunction.ts b/todoblue/src/app/[lang]/board/[board]/(page)/(view)/(sorting)/sortingModeToSortingFunction.ts
index 1ecc823..d997952 100644
--- a/todoblue/src/app/[lang]/board/[board]/(page)/(view)/(sorting)/sortingModeToSortingFunction.ts
+++ b/todoblue/src/app/[lang]/board/[board]/(page)/(view)/(sorting)/sortingModeToSortingFunction.ts
@@ -36,7 +36,7 @@ const SORTING_MODE_TO_SORTING_FUNCTION = {
         return TASK_IMPORTANCE_TO_VALUE[a[1].importance] - TASK_IMPORTANCE_TO_VALUE[b[1].importance]
     },
     [SortingMode.ByDeadline]: function sortTasksByPriority(a: TaskWithId, b: TaskWithId) {
-        return (a[1].deadline ?? -1) - (b[1].deadline ?? -1)
+        return (b[1].deadline ?? -1) - (a[1].deadline ?? -1)
     },
     [SortingMode.ByStatus]: function sortTasksByStatus(a: TaskWithId, b: TaskWithId) {
         if(a[1].journaled_on && !b[1].journaled_on) return 1;