diff --git a/Configs/.config/swaync/style.css b/Configs/.config/swaync/style.css
index 17e1ebd..a9b5cf5 100644
--- a/Configs/.config/swaync/style.css
+++ b/Configs/.config/swaync/style.css
@@ -1,30 +1,12 @@
-:root {
-  --cc-bg: rgb(46, 46, 46);
-  --noti-border-color: rgba(255, 255, 255, 0.15);
-  --noti-bg: 48, 48, 48;
-  --noti-bg-alpha: 0.98;
-  --noti-bg-darker: rgb(38, 38, 38);
-  --noti-bg-hover: rgb(56, 56, 56);
-  --noti-bg-focus: rgba(68, 68, 68, 0.6);
-  --noti-close-bg: rgb(56, 56, 56);
-  --noti-close-bg-hover: rgb(94, 94, 94);
-  --text-color: rgb(255, 255, 255);
-  --text-color-disabled: rgb(150, 150, 150);
-  --bg-selected: rgb(0, 128, 255);
-  --notification-icon-size: 64px;
-  --notification-app-icon-size: calc(var(--notification-icon-size) / 3);
-  --notification-group-icon-size: 32px;
-}
+@import "theme.css";
 
 .close-button {
-  /* The notification Close Button */
   background: var(--noti-close-bg);
   color: var(--text-color);
   text-shadow: none;
   padding: 0;
   border-radius: 100%;
-  margin-top: 8px;
-  margin-right: 8px;
+  margin: 8px 8px 0 0;
   box-shadow: none;
   border: none;
   min-width: 24px;
@@ -48,34 +30,17 @@
 }
 
 .notification-row .notification-background {
-  padding: 6px 12px;
+  padding: 5px 7px;
 }
 
-.notification-row .notification-background .notification {
-  /* The actual notification */
-  border-radius: 12px;
+.notification-row .notification {
+  border-radius: 13px;
   border: 1px solid var(--noti-border-color);
   transition: background 0.15s ease-in-out;
   background: rgba(var(--noti-bg), var(--noti-bg-alpha));
 }
 
-.notification-row .notification-background .notification.low {
-  /* Low Priority Notification */
-}
-
-.notification-row .notification-background .notification.normal {
-  /* Normal Priority Notification */
-}
-
-.notification-row .notification-background .notification.critical {
-  /* Critical Priority Notification */
-}
-
-.notification-row
-  .notification-background
-  .notification
-  .notification-default-action {
-  /* The large action that also displays the notification summary and body */
+.notification-default-action {
   padding: 4px;
   margin: 0;
   box-shadow: none;
@@ -86,54 +51,30 @@
   border-radius: 12px;
 }
 
-.notification-row
-  .notification-background
-  .notification
-  .notification-default-action:hover {
+.notification-default-action:hover {
   -gtk-icon-filter: none;
   background: var(--noti-bg-hover);
 }
 
-.notification-row
-  .notification-background
-  .notification
-  .notification-default-action:not(:only-child) {
-  /* When alternative actions are visible */
-  border-bottom-left-radius: 0px;
-  border-bottom-right-radius: 0px;
+.notification-default-action:not(:only-child) {
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
 }
 
-.notification-row
-  .notification-background
-  .notification
-  .notification-default-action
-  .notification-content {
+.notification-content {
   background: transparent;
   border-radius: 12px;
   padding: 0;
 }
 
-.notification-row
-  .notification-background
-  .notification
-  .notification-default-action
-  .notification-content
-  .image {
-  /* Notification Primary Image */
+.notification-content .image {
   -gtk-icon-filter: none;
   -gtk-icon-size: var(--notification-icon-size);
   border-radius: 100px;
-  /* Size in px */
   margin: 4px;
 }
 
-.notification-row
-  .notification-background
-  .notification
-  .notification-default-action
-  .notification-content
-  .app-icon {
-  /* Notification app icon (only visible when the primary image is set) */
+.notification-content .app-icon {
   -gtk-icon-filter: none;
   -gtk-icon-size: var(--notification-app-icon-size);
   -gtk-icon-shadow: 0 1px 4px black;
@@ -144,25 +85,13 @@
   padding: 4px 6px;
 }
 
-.notification-row
-  .notification-background
-  .notification
-  .notification-default-action
-  .notification-content
-  .text-box
-  label {
-  /* Fixes base GTK 4 CSS setting a filter of opacity 50% for some odd reason */
+.text-box label {
   filter: none;
 }
 
-.notification-row
-  .notification-background
-  .notification
-  .notification-default-action
-  .notification-content
-  .text-box
-  .summary {
-  /* Notification summary/title */
+.text-box .summary,
+.text-box .time,
+.text-box .body {
   font-size: 16px;
   font-weight: bold;
   background: transparent;
@@ -170,76 +99,27 @@
   text-shadow: none;
 }
 
-.notification-row
-  .notification-background
-  .notification
-  .notification-default-action
-  .notification-content
-  .text-box
-  .time {
-  /* Notification time-ago */
-  font-size: 16px;
-  font-weight: bold;
-  background: transparent;
-  color: var(--text-color);
-  text-shadow: none;
+.text-box .time {
   margin-right: 30px;
 }
 
-.notification-row
-  .notification-background
-  .notification
-  .notification-default-action
-  .notification-content
-  .text-box
-  .body {
-  /* Notification body */
+.text-box .body {
   font-size: 15px;
   font-weight: normal;
-  background: transparent;
-  color: var(--text-color);
-  text-shadow: none;
 }
 
-.notification-row
-  .notification-background
-  .notification
-  .notification-default-action
-  .notification-content
-  progressbar {
-  /* The optional notification progress bar */
+.notification-content progressbar,
+.notification-content .body-image,
+.notification-content .inline-reply {
   margin-top: 4px;
 }
 
-.notification-row
-  .notification-background
-  .notification
-  .notification-default-action
-  .notification-content
-  .body-image {
-  /* The "extra" optional bottom notification image */
-  margin-top: 4px;
+.body-image {
   background-color: white;
   -gtk-icon-filter: none;
 }
 
-.notification-row
-  .notification-background
-  .notification
-  .notification-default-action
-  .notification-content
-  .inline-reply {
-  /* The inline reply section */
-  margin-top: 4px;
-}
-
-.notification-row
-  .notification-background
-  .notification
-  .notification-default-action
-  .notification-content
-  .inline-reply
-  .inline-reply-entry {
+.inline-reply-entry {
   background: var(--noti-bg-darker);
   color: var(--text-color);
   caret-color: var(--text-color);
@@ -247,13 +127,7 @@
   border-radius: 12px;
 }
 
-.notification-row
-  .notification-background
-  .notification
-  .notification-default-action
-  .notification-content
-  .inline-reply
-  .inline-reply-button {
+.inline-reply-button {
   margin-left: 4px;
   background: rgba(var(--noti-bg), var(--noti-bg-alpha));
   border: 1px solid var(--noti-border-color);
@@ -261,119 +135,66 @@
   color: var(--text-color);
 }
 
-.notification-row
-  .notification-background
-  .notification
-  .notification-default-action
-  .notification-content
-  .inline-reply
-  .inline-reply-button:disabled {
+.inline-reply-button:disabled {
   background: initial;
   color: var(--text-color-disabled);
-  border: 1px solid var(--noti-border-color);
   border-color: transparent;
 }
 
-.notification-row
-  .notification-background
-  .notification
-  .notification-default-action
-  .notification-content
-  .inline-reply
-  .inline-reply-button:hover {
+.inline-reply-button:hover {
   background: var(--noti-bg-hover);
 }
 
-.notification-row
-  .notification-background
-  .notification
-  .notification-alt-actions {
+.notification-alt-actions {
   background: none;
-  border-bottom-left-radius: 12px;
-  border-bottom-right-radius: 12px;
+  border-radius: 0 0 12px 12px;
   padding: 4px;
 }
 
-.notification-row .notification-background .notification .notification-action {
-  /* The alternative actions below the default action */
+.notification-action {
   margin: 4px;
   padding: 0;
 }
 
-.notification-row
-  .notification-background
-  .notification
-  .notification-action
-  > button {
+.notification-action > button {
   border-radius: 12px;
 }
 
 .notification-group {
-  /* Styling only for Grouped Notifications */
   transition: opacity 200ms ease-in-out;
-  /* The groups close button */
 }
 
 .notification-group:focus {
   background: var(--noti-bg-focus);
 }
 
-.notification-group.low {
-  /* Low Priority Group */
-}
-
-.notification-group.normal {
-  /* Low Priority Group */
-}
-
-.notification-group.critical {
-  /* Low Priority Group */
-}
-
-.notification-group .notification-group-close-button .close-button {
+.notification-group-close-button .close-button {
   margin: 12px 20px;
 }
 
-.notification-group .notification-group-buttons,
-.notification-group .notification-group-headers {
+.notification-group-buttons,
+.notification-group-headers {
   margin: 0 16px;
   color: var(--text-color);
 }
 
-.notification-group .notification-group-headers {
-  /* Notification Group Headers */
-}
-
-.notification-group .notification-group-headers .notification-group-icon {
+.notification-group-icon {
   color: var(--text-color);
   -gtk-icon-size: var(--notification-group-icon-size);
 }
 
-.notification-group .notification-group-headers .notification-group-header {
+.notification-group-header {
   color: var(--text-color);
 }
 
-.notification-group .notification-group-buttons {
-  /* Notification Group Buttons */
-}
-
-.notification-group.collapsed {
-  /* When another group is expanded, lower the opacity of the collapsed ones */
-}
-
 .notification-group.collapsed.not-expanded {
   opacity: 0.4;
 }
 
-.notification-group.collapsed .notification-row .notification {
+.notification-group.collapsed .notification {
   background-color: rgba(var(--noti-bg), 1);
 }
 
-.notification-group.collapsed .notification-row:not(:last-child) {
-  /* Top notification in stack */
-  /* Set lower stacked notifications opacity to 0 */
-}
-
 .notification-group.collapsed
   .notification-row:not(:last-child)
   .notification-action,
@@ -390,45 +211,35 @@
 }
 
 .control-center {
-  /* The Control Center which contains the old notifications + widgets */
   background: var(--cc-bg);
   color: var(--text-color);
   border-radius: 12px;
 }
 
-.control-center .control-center-list-placeholder {
-  /* The placeholder when there are no notifications */
+.control-center-list-placeholder {
   opacity: 0.5;
 }
 
-.control-center .control-center-list {
-  /* List of notifications */
+.control-center-list {
   background: transparent;
 }
 
-.control-center .control-center-list .notification {
+.control-center .notification {
   box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.3), 0 1px 3px 1px rgba(0, 0, 0, 0.7),
     0 2px 6px 2px rgba(0, 0, 0, 0.3);
 }
 
-.control-center .control-center-list .notification .notification-default-action,
-.control-center .control-center-list .notification .notification-action {
+.control-center .notification-default-action,
+.control-center .notification-action {
   transition: opacity 400ms ease-in-out, background 0.15s ease-in-out;
 }
 
-.control-center
-  .control-center-list
-  .notification
-  .notification-default-action:hover,
-.control-center .control-center-list .notification .notification-action:hover {
+.control-center .notification-default-action:hover,
+.control-center .notification-action:hover {
   background-color: var(--noti-bg-hover);
 }
 
-.blank-window {
-  /* Window behind control center and on all other monitors */
-  background: transparent;
-}
-
+.blank-window,
 .floating-notifications {
   background: transparent;
 }
@@ -438,106 +249,84 @@
 }
 
 /*** Widgets ***/
-/* Title widget */
-.widget-title > label {
+.widget-title > label,
+.widget-dnd label,
+.widget-label > label,
+.widget-inhibitors > label {
   margin: 8px;
+  font-size: 1.1rem;
+}
+
+.widget-title > label,
+.widget-inhibitors > label {
   font-size: 1.5rem;
 }
 
-.widget-title > button {
+.widget-title > button,
+.widget-inhibitors > button {
   margin: 8px;
   border-radius: 12px;
 }
 
-/* DND widget */
-.widget-dnd label {
-  color: var(--text-color);
-  margin: 8px;
-  font-size: 1.1rem;
-}
-
 .widget-dnd switch {
   border-radius: 12px;
   margin: 8px;
 }
 
+.widget-dnd switch:checked {
+  background-color: var(--bg-selected);
+}
+
 .widget-dnd switch slider {
   border-radius: 12px;
 }
 
-/* Label widget */
 .widget-label {
   margin: 8px;
 }
 
-.widget-label > label {
-  font-size: 1.1rem;
-}
-
-/* Mpris widget */
-:root {
-  --mpris-album-art-overlay: rgba(0, 0, 0, 0.55);
-  --mpris-button-hover: rgba(0, 0, 0, 0.5);
-  --mpris-album-art-icon-size: 96px;
-}
-
 .widget-mpris {
   margin: 8px;
-  /* The parent to all players */
 }
 
-.widget-mpris .widget-mpris-player {
+.widget-mpris-player {
   margin: 16px 20px;
   border-radius: 12px;
   box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.75);
 }
 
-.widget-mpris .widget-mpris-player .mpris-background {
+.widget-mpris-player .mpris-background {
   filter: blur(10px);
 }
 
-.widget-mpris .widget-mpris-player .mpris-overlay {
+.widget-mpris-player .mpris-overlay {
   padding: 16px;
-  background-color: var(--mpris-album-art-overlay);
+  background-color: rgba(0, 0, 0, 0.75);
 }
 
-.widget-mpris .widget-mpris-player .mpris-overlay button:hover {
-  /* The media player buttons (play, pause, next, etc...) */
+.widget-mpris-player .mpris-overlay button:hover {
   background: var(--noti-bg-hover);
 }
 
-.widget-mpris .widget-mpris-player .mpris-overlay .widget-mpris-album-art {
+.widget-mpris-album-art {
   border-radius: 12px;
   box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.75);
   -gtk-icon-size: var(--mpris-album-art-icon-size);
 }
 
-.widget-mpris .widget-mpris-player .mpris-overlay .widget-mpris-title {
+.widget-mpris-title {
   font-weight: bold;
   font-size: 1.25rem;
 }
 
-.widget-mpris .widget-mpris-player .mpris-overlay .widget-mpris-subtitle {
+.widget-mpris-subtitle {
   font-size: 1.1rem;
 }
 
-.widget-mpris .widget-mpris-player .mpris-overlay > box > button {
-  /* Change player control buttons */
-}
-
-.widget-mpris .widget-mpris-player .mpris-overlay > box > button:hover {
+.mpris-overlay > box > button:hover {
   background-color: var(--mpris-button-hover);
 }
 
-.widget-mpris > box > button {
-  /* Change player side buttons */
-}
-
-.widget-mpris > box > button:disabled {
-  /* Change player side buttons insensitive */
-}
-
-/* Buttons widget */
 .widget-buttons-grid {
   padding: 8px;
   margin: 8px;
@@ -548,45 +337,15 @@
   border-radius: 12px;
 }
 
-.widget-buttons-grid flowboxchild > button.toggle:checked {
-  /* style given to the active toggle button */
-}
-
-/* Menubar widget */
-.widget-menubar {
-  /* The revealer buttons */
-  /* .AnyName { Name defined in config after #
-    background-color: rgba(var(--noti-bg), 1.0);
-    padding: 8px;
-    margin: 8px;
-    border-radius: 12px;
-  }
-
-  .AnyName>button {
-    background: transparent;
-    border: none;
-  }
-
-  .AnyName>button:hover {
-    background-color: var(--noti-bg-hover);
-  } */
-}
-
-.widget-menubar > .menu-button-bar {
-  /* The left button container */
-  /* The right button container */
-  /* The left and right button container */
-}
-
-.widget-menubar > .menu-button-bar > .start {
+.menu-button-bar > .start {
   margin-left: 8px;
 }
 
-.widget-menubar > .menu-button-bar > .end {
+.menu-button-bar > .end {
   margin-right: 8px;
 }
 
-.widget-menubar > .menu-button-bar > .widget-menubar-container button {
+.widget-menubar-container button {
   border-radius: 12px;
   margin: 0 4px;
 }
@@ -601,18 +360,14 @@
   margin-top: 0;
 }
 
-/* Volume widget */
-:root {
-  --widget-volume-row-icon-size: 24px;
-}
-
-.widget-volume {
+.widget-volume,
+.widget-slider,
+.widget-backlight {
   padding: 8px;
   margin: 8px;
   border-radius: 12px;
 }
 
-/* Each row app icon */
 .widget-volume row image {
   -gtk-icon-size: var(--widget-volume-row-icon-size);
 }
@@ -624,31 +379,6 @@
   border-radius: 12px;
 }
 
-/* Slider widget */
-.widget-slider {
-  padding: 8px;
-  margin: 8px;
-  border-radius: 12px;
-}
-
 .widget-slider label {
   font-size: inherit;
 }
-
-/* Backlight widget */
-.widget-backlight {
-  padding: 8px;
-  margin: 8px;
-  border-radius: 12px;
-}
-
-/* Inhibitors widget */
-.widget-inhibitors > label {
-  margin: 8px;
-  font-size: 1.5rem;
-}
-
-.widget-inhibitors > button {
-  margin: 8px;
-  border-radius: 12px;
-}