diff --git a/src/components/Calendar.slint b/src/components/Calendar.slint
index 0ddfe53..eb2a8af 100644
--- a/src/components/Calendar.slint
+++ b/src/components/Calendar.slint
@@ -74,7 +74,7 @@ export component Calendar inherits Rectangle {
 						y: header-height - 32px;
 						width: 1px;
 						height: parent.height;
-						background: Palette.card-background.transparentize(0.5);
+						background: Palette.card-background.brighter(0.5);
 					}
 					VerticalLayout {
 						y: 0;
@@ -87,7 +87,7 @@ export component Calendar inherits Rectangle {
 						}
 					}
 					for hour[hour-index] in 24 : Rectangle {
-						background: Palette.card-background.transparentize(0.5);
+						background: Palette.card-background.brighter(0.5);
 						x: 0px;
 						width: parent.width;
 						y: day-start-y + hour-spacing * hour-index;
@@ -120,7 +120,7 @@ export component Calendar inherits Rectangle {
 									wrap: TextWrap.word-wrap;
 								}
 							}
-						}	
+						}
 
 						eventActionsPopup := VPopupIconMenu {
 							//VActionButton {
diff --git a/src/windows/AppWindow/AppWindow.slint b/src/windows/AppWindow/AppWindow.slint
index 8d82810..49f7eef 100644
--- a/src/windows/AppWindow/AppWindow.slint
+++ b/src/windows/AppWindow/AppWindow.slint
@@ -8,46 +8,65 @@ import { EditSourceWindow } from "../EditSourceWindow/EditSourceWindow.slint";
 import { Palette } from "@selenite";
 import { CalendarView } from "views/CalendarView.slint";
 import { VButton } from "../../../external/selenite/components/Button.slint";
+import { ToggleButton } from "../../../external/selenite/components/index.slint";
 
 export component AppWindow inherits Window {
 
 	title: "Mirai";
 	//min-height: 100px;
 	//max-height: 4000px; // needed, otherwise the window wants to fit the content (on Swaywm)
-	background: Palette.pane;
+	background: Palette.background;
 
 	private property<bool> show-tasks: false;
 
     HorizontalLayout {
+   //     padding: 16px;
+		//spacing: 16px;
 		VerticalLayout {
-			VerticalLayout {
-				padding: 16px;
-				alignment: LayoutAlignment.stretch;
-				spacing: 8px;
-				VButton {
-					text: "Calendar";
-					clicked => { show-tasks = false }
-				}
+			Rectangle {
+				background: Palette.pane;
+   //             border-radius: 8px;
+				//clip: true;
+				VerticalLayout {
+					VerticalLayout {
+						padding: 16px;
+						alignment: LayoutAlignment.stretch;
+						spacing: 8px;
+						ToggleButton {
+							text: "Calendar";
+							active: !show-tasks;
+							clicked => { show-tasks = false }
+						}
 
-				VButton {
-					text: "Tasks";
-					clicked => { show-tasks = true }
+						ToggleButton {
+							text: "Tasks";
+							active: show-tasks;
+							clicked => { show-tasks = true }
+						}
+					}
+					SideBar {
+						min-width: 256px;
+					}
+				}	
+			}
+		}	
+		Rectangle {
+			width: 1px;
+			background: Palette.card-background;
+		}
+		Rectangle {
+			background: Palette.background;
+			//border-radius: 8px;
+			//clip: true;
+			VerticalLayout {
+				if show-tasks : MainView {
+					horizontal-stretch: 1;
+				}
+				if !show-tasks : CalendarView {
+					horizontal-stretch: 1;
 				}
 			}
-			SideBar {
-				min-width: 256px;
-			}
-		}	
-		VerticalLayout {
-				
-		
-			if show-tasks : MainView {
-				horizontal-stretch: 1;
-			}
-			if !show-tasks : CalendarView {
-				horizontal-stretch: 1;
-			}
-		}	
+		}		
      }
 }
 
diff --git a/src/windows/AppWindow/views/CalendarView.slint b/src/windows/AppWindow/views/CalendarView.slint
index a4d5487..9ab3574 100644
--- a/src/windows/AppWindow/views/CalendarView.slint
+++ b/src/windows/AppWindow/views/CalendarView.slint
@@ -11,7 +11,6 @@ import { VActionButton } from "../../../../external/selenite/components/index.sl
 
 export component CalendarView inherits Rectangle {
 
-	background: Palette.background;
 	private property<string> icon-visible: Svg.visible;
 	private property<string> icon-not-visible: Svg.not-visible;
 	private property<bool> completed-tasks-visible: false;
diff --git a/src/windows/AppWindow/views/SideBar.slint b/src/windows/AppWindow/views/SideBar.slint
index 26a25a8..5565853 100644
--- a/src/windows/AppWindow/views/SideBar.slint
+++ b/src/windows/AppWindow/views/SideBar.slint
@@ -3,7 +3,6 @@ import { AppWindowActions } from "../Actions.slint";
 import { VButton, ToggleButton, VActionButton, VText, Svg, Palette } from "@selenite";
 
 export component SideBar inherits Rectangle {
-	background: Palette.pane;
 
 	VerticalLayout {
 		height: parent.height;
diff --git a/src/windows/AppWindow/views/TasksView.slint b/src/windows/AppWindow/views/TasksView.slint
index 0245aff..6867e3e 100644
--- a/src/windows/AppWindow/views/TasksView.slint
+++ b/src/windows/AppWindow/views/TasksView.slint
@@ -10,7 +10,6 @@ import { Utils } from "../../../shared/Utils.slint";
 
 export component MainView inherits Rectangle {
 
-	background: Palette.background;
 	private property<string> icon-visible: Svg.visible;
 	private property<string> icon-not-visible: Svg.not-visible;
 	private property<bool> completed-tasks-visible: false;