diff --git a/src/gtk/gtk-3.0/gtk-aliz.css b/src/gtk/gtk-3.0/gtk-aliz.css
index ff7ea44d..d79ed82b 100644
--- a/src/gtk/gtk-3.0/gtk-aliz.css
+++ b/src/gtk/gtk-3.0/gtk-aliz.css
@@ -3824,20 +3824,6 @@ scrolledwindow viewport.frame {
   border: none;
 }
 
-scrolledwindow viewport.frame .frame {
-  border: none;
-}
-
-scrolledwindow viewport.frame .frame > textview {
-  border-radius: 2px;
-  background: none;
-}
-
-scrolledwindow viewport.frame .frame > textview > text {
-  border-radius: 2px;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-}
-
 scrolledwindow viewport.frame > box.vertical list.content.view {
   border-top-left-radius: 2px;
   border-top-right-radius: 2px;
@@ -5694,11 +5680,11 @@ window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.ti
   border-radius: 0;
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-light, window.background.org-gnome-Calendar .week-view weekgrid event.color-light > stack > grid > label {
+window.background.org-gnome-Calendar event.color-light, window.background.org-gnome-Calendar event.color-light > stack > grid > label {
   color: rgba(0, 0, 0, 0.75);
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-dark, window.background.org-gnome-Calendar .week-view weekgrid event.color-dark > stack > grid > label {
+window.background.org-gnome-Calendar event.color-dark, window.background.org-gnome-Calendar event.color-dark > stack > grid > label {
   color: white;
 }
 
diff --git a/src/gtk/gtk-3.0/gtk-azul.css b/src/gtk/gtk-3.0/gtk-azul.css
index 24d47cfb..3926bb81 100644
--- a/src/gtk/gtk-3.0/gtk-azul.css
+++ b/src/gtk/gtk-3.0/gtk-azul.css
@@ -3824,20 +3824,6 @@ scrolledwindow viewport.frame {
   border: none;
 }
 
-scrolledwindow viewport.frame .frame {
-  border: none;
-}
-
-scrolledwindow viewport.frame .frame > textview {
-  border-radius: 2px;
-  background: none;
-}
-
-scrolledwindow viewport.frame .frame > textview > text {
-  border-radius: 2px;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-}
-
 scrolledwindow viewport.frame > box.vertical list.content.view {
   border-top-left-radius: 2px;
   border-top-right-radius: 2px;
@@ -5694,11 +5680,11 @@ window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.ti
   border-radius: 0;
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-light, window.background.org-gnome-Calendar .week-view weekgrid event.color-light > stack > grid > label {
+window.background.org-gnome-Calendar event.color-light, window.background.org-gnome-Calendar event.color-light > stack > grid > label {
   color: rgba(0, 0, 0, 0.75);
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-dark, window.background.org-gnome-Calendar .week-view weekgrid event.color-dark > stack > grid > label {
+window.background.org-gnome-Calendar event.color-dark, window.background.org-gnome-Calendar event.color-dark > stack > grid > label {
   color: white;
 }
 
diff --git a/src/gtk/gtk-3.0/gtk-dark-aliz.css b/src/gtk/gtk-3.0/gtk-dark-aliz.css
index 22ac0d80..9fa8c93a 100644
--- a/src/gtk/gtk-3.0/gtk-dark-aliz.css
+++ b/src/gtk/gtk-3.0/gtk-dark-aliz.css
@@ -3824,20 +3824,6 @@ scrolledwindow viewport.frame {
   border: none;
 }
 
-scrolledwindow viewport.frame .frame {
-  border: none;
-}
-
-scrolledwindow viewport.frame .frame > textview {
-  border-radius: 2px;
-  background: none;
-}
-
-scrolledwindow viewport.frame .frame > textview > text {
-  border-radius: 2px;
-  border: 1px solid rgba(0, 0, 0, 0.25);
-}
-
 scrolledwindow viewport.frame > box.vertical list.content.view {
   border-top-left-radius: 2px;
   border-top-right-radius: 2px;
@@ -5693,11 +5679,11 @@ window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.ti
   border-radius: 0;
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-light, window.background.org-gnome-Calendar .week-view weekgrid event.color-light > stack > grid > label {
+window.background.org-gnome-Calendar event.color-light, window.background.org-gnome-Calendar event.color-light > stack > grid > label {
   color: rgba(0, 0, 0, 0.75);
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-dark, window.background.org-gnome-Calendar .week-view weekgrid event.color-dark > stack > grid > label {
+window.background.org-gnome-Calendar event.color-dark, window.background.org-gnome-Calendar event.color-dark > stack > grid > label {
   color: white;
 }
 
diff --git a/src/gtk/gtk-3.0/gtk-dark-azul.css b/src/gtk/gtk-3.0/gtk-dark-azul.css
index 76be2ff7..6610a096 100644
--- a/src/gtk/gtk-3.0/gtk-dark-azul.css
+++ b/src/gtk/gtk-3.0/gtk-dark-azul.css
@@ -3824,20 +3824,6 @@ scrolledwindow viewport.frame {
   border: none;
 }
 
-scrolledwindow viewport.frame .frame {
-  border: none;
-}
-
-scrolledwindow viewport.frame .frame > textview {
-  border-radius: 2px;
-  background: none;
-}
-
-scrolledwindow viewport.frame .frame > textview > text {
-  border-radius: 2px;
-  border: 1px solid rgba(0, 0, 0, 0.25);
-}
-
 scrolledwindow viewport.frame > box.vertical list.content.view {
   border-top-left-radius: 2px;
   border-top-right-radius: 2px;
@@ -5693,11 +5679,11 @@ window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.ti
   border-radius: 0;
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-light, window.background.org-gnome-Calendar .week-view weekgrid event.color-light > stack > grid > label {
+window.background.org-gnome-Calendar event.color-light, window.background.org-gnome-Calendar event.color-light > stack > grid > label {
   color: rgba(0, 0, 0, 0.75);
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-dark, window.background.org-gnome-Calendar .week-view weekgrid event.color-dark > stack > grid > label {
+window.background.org-gnome-Calendar event.color-dark, window.background.org-gnome-Calendar event.color-dark > stack > grid > label {
   color: white;
 }
 
diff --git a/src/gtk/gtk-3.0/gtk-dark-pueril.css b/src/gtk/gtk-3.0/gtk-dark-pueril.css
index 453f8371..d92b7098 100644
--- a/src/gtk/gtk-3.0/gtk-dark-pueril.css
+++ b/src/gtk/gtk-3.0/gtk-dark-pueril.css
@@ -3824,20 +3824,6 @@ scrolledwindow viewport.frame {
   border: none;
 }
 
-scrolledwindow viewport.frame .frame {
-  border: none;
-}
-
-scrolledwindow viewport.frame .frame > textview {
-  border-radius: 2px;
-  background: none;
-}
-
-scrolledwindow viewport.frame .frame > textview > text {
-  border-radius: 2px;
-  border: 1px solid rgba(0, 0, 0, 0.25);
-}
-
 scrolledwindow viewport.frame > box.vertical list.content.view {
   border-top-left-radius: 2px;
   border-top-right-radius: 2px;
@@ -5693,11 +5679,11 @@ window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.ti
   border-radius: 0;
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-light, window.background.org-gnome-Calendar .week-view weekgrid event.color-light > stack > grid > label {
+window.background.org-gnome-Calendar event.color-light, window.background.org-gnome-Calendar event.color-light > stack > grid > label {
   color: rgba(0, 0, 0, 0.75);
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-dark, window.background.org-gnome-Calendar .week-view weekgrid event.color-dark > stack > grid > label {
+window.background.org-gnome-Calendar event.color-dark, window.background.org-gnome-Calendar event.color-dark > stack > grid > label {
   color: white;
 }
 
diff --git a/src/gtk/gtk-3.0/gtk-dark-sea.css b/src/gtk/gtk-3.0/gtk-dark-sea.css
index 8ea6e2ce..7695005b 100644
--- a/src/gtk/gtk-3.0/gtk-dark-sea.css
+++ b/src/gtk/gtk-3.0/gtk-dark-sea.css
@@ -3824,20 +3824,6 @@ scrolledwindow viewport.frame {
   border: none;
 }
 
-scrolledwindow viewport.frame .frame {
-  border: none;
-}
-
-scrolledwindow viewport.frame .frame > textview {
-  border-radius: 2px;
-  background: none;
-}
-
-scrolledwindow viewport.frame .frame > textview > text {
-  border-radius: 2px;
-  border: 1px solid rgba(0, 0, 0, 0.25);
-}
-
 scrolledwindow viewport.frame > box.vertical list.content.view {
   border-top-left-radius: 2px;
   border-top-right-radius: 2px;
@@ -5693,11 +5679,11 @@ window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.ti
   border-radius: 0;
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-light, window.background.org-gnome-Calendar .week-view weekgrid event.color-light > stack > grid > label {
+window.background.org-gnome-Calendar event.color-light, window.background.org-gnome-Calendar event.color-light > stack > grid > label {
   color: rgba(0, 0, 0, 0.75);
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-dark, window.background.org-gnome-Calendar .week-view weekgrid event.color-dark > stack > grid > label {
+window.background.org-gnome-Calendar event.color-dark, window.background.org-gnome-Calendar event.color-dark > stack > grid > label {
   color: white;
 }
 
diff --git a/src/gtk/gtk-3.0/gtk-light-aliz.css b/src/gtk/gtk-3.0/gtk-light-aliz.css
index 2d7f209e..98aa7625 100644
--- a/src/gtk/gtk-3.0/gtk-light-aliz.css
+++ b/src/gtk/gtk-3.0/gtk-light-aliz.css
@@ -3823,20 +3823,6 @@ scrolledwindow viewport.frame {
   border: none;
 }
 
-scrolledwindow viewport.frame .frame {
-  border: none;
-}
-
-scrolledwindow viewport.frame .frame > textview {
-  border-radius: 2px;
-  background: none;
-}
-
-scrolledwindow viewport.frame .frame > textview > text {
-  border-radius: 2px;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-}
-
 scrolledwindow viewport.frame > box.vertical list.content.view {
   border-top-left-radius: 2px;
   border-top-right-radius: 2px;
@@ -5693,11 +5679,11 @@ window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.ti
   border-radius: 0;
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-light, window.background.org-gnome-Calendar .week-view weekgrid event.color-light > stack > grid > label {
+window.background.org-gnome-Calendar event.color-light, window.background.org-gnome-Calendar event.color-light > stack > grid > label {
   color: rgba(0, 0, 0, 0.75);
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-dark, window.background.org-gnome-Calendar .week-view weekgrid event.color-dark > stack > grid > label {
+window.background.org-gnome-Calendar event.color-dark, window.background.org-gnome-Calendar event.color-dark > stack > grid > label {
   color: white;
 }
 
diff --git a/src/gtk/gtk-3.0/gtk-light-azul.css b/src/gtk/gtk-3.0/gtk-light-azul.css
index fa29b7d0..a5a318d7 100644
--- a/src/gtk/gtk-3.0/gtk-light-azul.css
+++ b/src/gtk/gtk-3.0/gtk-light-azul.css
@@ -3823,20 +3823,6 @@ scrolledwindow viewport.frame {
   border: none;
 }
 
-scrolledwindow viewport.frame .frame {
-  border: none;
-}
-
-scrolledwindow viewport.frame .frame > textview {
-  border-radius: 2px;
-  background: none;
-}
-
-scrolledwindow viewport.frame .frame > textview > text {
-  border-radius: 2px;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-}
-
 scrolledwindow viewport.frame > box.vertical list.content.view {
   border-top-left-radius: 2px;
   border-top-right-radius: 2px;
@@ -5693,11 +5679,11 @@ window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.ti
   border-radius: 0;
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-light, window.background.org-gnome-Calendar .week-view weekgrid event.color-light > stack > grid > label {
+window.background.org-gnome-Calendar event.color-light, window.background.org-gnome-Calendar event.color-light > stack > grid > label {
   color: rgba(0, 0, 0, 0.75);
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-dark, window.background.org-gnome-Calendar .week-view weekgrid event.color-dark > stack > grid > label {
+window.background.org-gnome-Calendar event.color-dark, window.background.org-gnome-Calendar event.color-dark > stack > grid > label {
   color: white;
 }
 
diff --git a/src/gtk/gtk-3.0/gtk-light-pueril.css b/src/gtk/gtk-3.0/gtk-light-pueril.css
index 089bda30..8212bf67 100644
--- a/src/gtk/gtk-3.0/gtk-light-pueril.css
+++ b/src/gtk/gtk-3.0/gtk-light-pueril.css
@@ -3823,20 +3823,6 @@ scrolledwindow viewport.frame {
   border: none;
 }
 
-scrolledwindow viewport.frame .frame {
-  border: none;
-}
-
-scrolledwindow viewport.frame .frame > textview {
-  border-radius: 2px;
-  background: none;
-}
-
-scrolledwindow viewport.frame .frame > textview > text {
-  border-radius: 2px;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-}
-
 scrolledwindow viewport.frame > box.vertical list.content.view {
   border-top-left-radius: 2px;
   border-top-right-radius: 2px;
@@ -5693,11 +5679,11 @@ window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.ti
   border-radius: 0;
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-light, window.background.org-gnome-Calendar .week-view weekgrid event.color-light > stack > grid > label {
+window.background.org-gnome-Calendar event.color-light, window.background.org-gnome-Calendar event.color-light > stack > grid > label {
   color: rgba(0, 0, 0, 0.75);
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-dark, window.background.org-gnome-Calendar .week-view weekgrid event.color-dark > stack > grid > label {
+window.background.org-gnome-Calendar event.color-dark, window.background.org-gnome-Calendar event.color-dark > stack > grid > label {
   color: white;
 }
 
diff --git a/src/gtk/gtk-3.0/gtk-light-sea.css b/src/gtk/gtk-3.0/gtk-light-sea.css
index 9bc51084..c04c6a45 100644
--- a/src/gtk/gtk-3.0/gtk-light-sea.css
+++ b/src/gtk/gtk-3.0/gtk-light-sea.css
@@ -3823,20 +3823,6 @@ scrolledwindow viewport.frame {
   border: none;
 }
 
-scrolledwindow viewport.frame .frame {
-  border: none;
-}
-
-scrolledwindow viewport.frame .frame > textview {
-  border-radius: 2px;
-  background: none;
-}
-
-scrolledwindow viewport.frame .frame > textview > text {
-  border-radius: 2px;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-}
-
 scrolledwindow viewport.frame > box.vertical list.content.view {
   border-top-left-radius: 2px;
   border-top-right-radius: 2px;
@@ -5693,11 +5679,11 @@ window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.ti
   border-radius: 0;
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-light, window.background.org-gnome-Calendar .week-view weekgrid event.color-light > stack > grid > label {
+window.background.org-gnome-Calendar event.color-light, window.background.org-gnome-Calendar event.color-light > stack > grid > label {
   color: rgba(0, 0, 0, 0.75);
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-dark, window.background.org-gnome-Calendar .week-view weekgrid event.color-dark > stack > grid > label {
+window.background.org-gnome-Calendar event.color-dark, window.background.org-gnome-Calendar event.color-dark > stack > grid > label {
   color: white;
 }
 
diff --git a/src/gtk/gtk-3.0/gtk-pueril.css b/src/gtk/gtk-3.0/gtk-pueril.css
index 475a9a5c..39013dfd 100644
--- a/src/gtk/gtk-3.0/gtk-pueril.css
+++ b/src/gtk/gtk-3.0/gtk-pueril.css
@@ -3824,20 +3824,6 @@ scrolledwindow viewport.frame {
   border: none;
 }
 
-scrolledwindow viewport.frame .frame {
-  border: none;
-}
-
-scrolledwindow viewport.frame .frame > textview {
-  border-radius: 2px;
-  background: none;
-}
-
-scrolledwindow viewport.frame .frame > textview > text {
-  border-radius: 2px;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-}
-
 scrolledwindow viewport.frame > box.vertical list.content.view {
   border-top-left-radius: 2px;
   border-top-right-radius: 2px;
@@ -5694,11 +5680,11 @@ window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.ti
   border-radius: 0;
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-light, window.background.org-gnome-Calendar .week-view weekgrid event.color-light > stack > grid > label {
+window.background.org-gnome-Calendar event.color-light, window.background.org-gnome-Calendar event.color-light > stack > grid > label {
   color: rgba(0, 0, 0, 0.75);
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-dark, window.background.org-gnome-Calendar .week-view weekgrid event.color-dark > stack > grid > label {
+window.background.org-gnome-Calendar event.color-dark, window.background.org-gnome-Calendar event.color-dark > stack > grid > label {
   color: white;
 }
 
diff --git a/src/gtk/gtk-3.0/gtk-sea.css b/src/gtk/gtk-3.0/gtk-sea.css
index 1f2c99ff..b713b9e3 100644
--- a/src/gtk/gtk-3.0/gtk-sea.css
+++ b/src/gtk/gtk-3.0/gtk-sea.css
@@ -3824,20 +3824,6 @@ scrolledwindow viewport.frame {
   border: none;
 }
 
-scrolledwindow viewport.frame .frame {
-  border: none;
-}
-
-scrolledwindow viewport.frame .frame > textview {
-  border-radius: 2px;
-  background: none;
-}
-
-scrolledwindow viewport.frame .frame > textview > text {
-  border-radius: 2px;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-}
-
 scrolledwindow viewport.frame > box.vertical list.content.view {
   border-top-left-radius: 2px;
   border-top-right-radius: 2px;
@@ -5694,11 +5680,11 @@ window.background.csd.unified > deck > deck > deck > box.vertical > headerbar.ti
   border-radius: 0;
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-light, window.background.org-gnome-Calendar .week-view weekgrid event.color-light > stack > grid > label {
+window.background.org-gnome-Calendar event.color-light, window.background.org-gnome-Calendar event.color-light > stack > grid > label {
   color: rgba(0, 0, 0, 0.75);
 }
 
-window.background.org-gnome-Calendar .week-view weekgrid event.color-dark, window.background.org-gnome-Calendar .week-view weekgrid event.color-dark > stack > grid > label {
+window.background.org-gnome-Calendar event.color-dark, window.background.org-gnome-Calendar event.color-dark > stack > grid > label {
   color: white;
 }
 
diff --git a/src/gtk/sass/_common-3.0.scss b/src/gtk/sass/_common-3.0.scss
index 6481d014..73647d77 100644
--- a/src/gtk/sass/_common-3.0.scss
+++ b/src/gtk/sass/_common-3.0.scss
@@ -2068,13 +2068,13 @@ menu,
   // overflow buttons
 
   > arrow {
-//    @include button(undecorated);
+    // @include button(undecorated);
     min-width: 16px;
     min-height: 16px;
     padding: 4px;
     background-color: $_menu_bg;
     border-radius: 0;
-//    border: 1px solid $borders_color;
+    // border: 1px solid $borders_color;
 
     &.top {
       margin-top: -6px;
@@ -2848,20 +2848,6 @@ scrolledwindow {
   viewport.frame { // avoid double borders when viewport inside scrolled window
     border: none;
 
-    .frame {
-      border: none;
-
-      > textview {
-        border-radius: 2px;
-        background: none;
-
-        > text {
-          border-radius: 2px;
-          border: 1px solid $borders_color;
-        }
-      }
-    }
-
     > box.vertical list.content.view {
       border-top-left-radius: 2px;
       border-top-right-radius: 2px;
@@ -3065,7 +3051,6 @@ calendar {
 //
 
 messagedialog { // Message Dialog styling
-
   &.csd .titlebar {
     min-height: 20px;
     background-color: $bg_color;
diff --git a/src/gtk/sass/apps/_gnome.scss b/src/gtk/sass/apps/_gnome.scss
index f2573731..67d1b360 100644
--- a/src/gtk/sass/apps/_gnome.scss
+++ b/src/gtk/sass/apps/_gnome.scss
@@ -617,17 +617,15 @@ window.background.csd.unified {
 //
 
 window.background.org-gnome-Calendar {
-  .week-view weekgrid {
-    event.color-light {
-      &, & > stack > grid > label {
-        color: rgba(black, 0.75);
-      }
+  event.color-light {
+    &, & > stack > grid > label {
+      color: rgba(black, 0.75);
     }
+  }
 
-    event.color-dark {
-      &, & > stack > grid > label {
-        color: rgba(white, 1);
-      }
+  event.color-dark {
+    &, & > stack > grid > label {
+      color: rgba(white, 1);
     }
   }
 }