diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml
index 8f51166..bc857eb 100644
--- a/modules/bar/Bar.qml
+++ b/modules/bar/Bar.qml
@@ -3,8 +3,12 @@ import Quickshell
 import Quickshell.Hyprland
 import "./widgets"
 
+// TODO: interact with PyWal
+
 PanelWindow {
-    id: panel 
+    id: panel
+
+    color: "transparent"
 
     anchors.top: true
     anchors.left: true
@@ -25,7 +29,7 @@ PanelWindow {
     Rectangle { // Bar
         id: bar
         anchors.fill: parent   
-        color: "#1a1a1a"
+        color: "#800a0a0a"
         radius: 0
 
         Row {   // bar widgets left
@@ -42,7 +46,7 @@ PanelWindow {
                 thisMonitor: barThisMonitor 
                 anchors.verticalCenter: parent.verticalCenter
             }
-
+            // TODO: Maybe add current Apps in workspace
 
         }
 
@@ -53,6 +57,8 @@ PanelWindow {
 
             Clock {}
 
+            // TODO: Add a way to see Date (maybe hover or click)
+
         }
 
         Row { // bar widgets right
@@ -63,7 +69,11 @@ PanelWindow {
             anchors.rightMargin: 16
             spacing: 8
 
+            // TODO: Add bluetooth, network, audio, power, maybe HW monitor
+
         }
 
+        // TODO: Somewhere add Tray
+
     }
-}
\ No newline at end of file
+}
diff --git a/modules/bar/widgets/Clock.qml b/modules/bar/widgets/Clock.qml
index c12eae0..5c43afb 100644
--- a/modules/bar/widgets/Clock.qml
+++ b/modules/bar/widgets/Clock.qml
@@ -2,24 +2,35 @@ import QtQuick
 import Quickshell
 import Quickshell.Hyprland
 
-Text {
-    id: timeDisplay
+Rectangle {  //workspace
+    width: timeDisplay.width + 16
+    height: timeDisplay.height + 16
+    radius: 4
+    color: "#333333"
+    border.color: "#555555"
+    border.width: 2
 
-    property string currentTime: ""
+    Text {
+        id: timeDisplay
 
-    text: currentTime
-    color: "#ffffff"
-    font.pixelSize: 14
-    font.family: "Inter, sans-serif"
+        property string currentTime: ""
 
-    //Update time every second
-    Timer {
-        interval: 1000
-        running: true
-        repeat: true
-        onTriggered: {
-            var now = new Date()
-            timeDisplay.currentTime = Qt.formatTime(now, "hh:mm:ss")
+        text: currentTime
+        color: "#ffffff"
+        font.pixelSize: 18
+        font.family: "Inter, sans-serif"
+
+        anchors.centerIn: parent
+
+        //Update time every second
+        Timer {
+            interval: 1000
+            running: true
+            repeat: true
+            onTriggered: {
+                var now = new Date()
+                timeDisplay.currentTime = Qt.formatTime(now, "hh:mm:ss")
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/modules/bar/widgets/Workspaces.qml b/modules/bar/widgets/Workspaces.qml
index bb5794d..2a03db9 100644
--- a/modules/bar/widgets/Workspaces.qml
+++ b/modules/bar/widgets/Workspaces.qml
@@ -14,8 +14,8 @@ Row {   // Workspace Row
 
         Rectangle {  //workspace
             visible: modelData.monitor === thisMonitor  
-            width: 32
-            height: 24
+            width: workspaceNum.width + 16
+            height: workspaceNum.height + 8
             radius: 4
             color: modelData.active ? "#4a93ff": "#333333"
             border.color: "#555555"
@@ -29,19 +29,21 @@ Row {   // Workspace Row
             }
 
             Text {
+                id: workspaceNum
                 text: modelData.id
                 anchors.centerIn: parent
                 color: modelData.active ? "#ffffff" : "#cccccc"
-                font.pixelSize: 12
+                font.pixelSize: 18
                 font.family: "Inter, sans-serif"
             }
         }
+
     }
 
     Text {
         visible: Hyprland.workspaces.length === 0
         text: "No Workspaces"
         color: "#ffffff"
-        font.pixelSize: 12
+        font.pixelSize: 18
     }
 }