diff --git a/eww/windows/calendar.yuck b/eww/windows/calendar.yuck
index 1f0ad2b..dc56634 100644
--- a/eww/windows/calendar.yuck
+++ b/eww/windows/calendar.yuck
@@ -1,22 +1,20 @@
-(defwindow calendar
+(defwindow calendar-window
     :monitor 0
-    :geometry (geometry :width 300
-                        :height 250
-                        :anchor "top center"
-    )
+    :geometry (geometry :anchor "top center")
     :stacking "fg"
     :exclusive false
     :namespace "eww-calendar"
-    (box
-        (cal)
-    )
-)
 
-(defwidget cal []
-    (box :class "widget-calendar"
-        (box :class "month-calendar"
-            (button :class "day"
-            1)
-        )
+    (box :class "calendar-box"
+         :space-evenly false
+         :orientation "vertical"
+
+        (label :class "calendar-header"
+               :text "Calendar")
+        (calendar :class "month-calendar"
+                  :show-details true
+                  :show-heading true
+                  :show-day-names true
+                  :show-week-numbers false)
     )
 )
diff --git a/eww/windows/control-center.yuck b/eww/windows/control-center.yuck
index af75a60..0f3eb13 100644
--- a/eww/windows/control-center.yuck
+++ b/eww/windows/control-center.yuck
@@ -1,24 +1,30 @@
+(include "./widgets/control-center/quickactions.yuck")
+
 (defwindow control-center []
     :monitor 0
     :geometry (geometry :width "500px"
-                        :height "90%"
+                        :height "95%"
                         :anchor "center right")
     :stacking "overlay"
     :exclusive false
     :namespace "eww-cc"
 
-    (box
-        (toggles)
+    (box :class "cc"
+         :orientation "vertical"
+        (quickactions)
+        (toggle-row)
     )
 )
 
-(defwidget toggles []
+(defwidget toggle-row []
     (box :class "row"
-        (button :onclick "notify-send 'stop internet!'"
-            (box
-                (label :class "title" :text "Internet >")
-                (label :class "extra" :text "Caique Wifi")
-            )
-        )
+         :space-evenly false
+
+        (button :class "network"
+        "󰤨 ")
+        (button :class "bluetooth"
+        "󰂯 ")
+        (button :class "dnd"
+        "󰒲 ")
     )
 )