diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index c60a8516b9..220991c00d 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -104,6 +104,7 @@ $asset_suffix: if($variant=='dark', '-dark', '');
   }
 }
 
+textview text,
 .view {
   color: $text_color;
   background-color: $base_color;
@@ -166,7 +167,7 @@ assistant {
   }
 }
 
-GtkTextView { // This will get overridden by .view, needed by gedit line numbers
+textview { // This will get overridden by .view, needed by gedit line numbers
   background-color: mix($bg_color, $base_color, 50%);
   &:backdrop { background-color: mix($backdrop_bg_color,
                                      $backdrop_base_color, 50%); }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 52bc1f8ba6..339dad8be2 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -64,13 +64,17 @@
     background-color: #215d9c;
     color: #ffffff; }
 
+textview text,
 .view {
   color: white;
   background-color: #292929; }
+  textview text:backdrop,
   .view:backdrop {
     color: #d5d5d5;
     background-color: #2c2c2c; }
-  .view:selected, calendar:selected {
+  textview text:selected,
+  .view:selected,
+  calendar:selected {
     border-radius: 3px; }
 
 .rubberband, treeview.view.rubberband, .content-view.rubberband {
@@ -108,9 +112,9 @@ assistant .sidebar label {
 assistant .sidebar label.highlight {
   background-color: #5d6262; }
 
-GtkTextView {
+textview {
   background-color: #313434; }
-  GtkTextView:backdrop {
+  textview:backdrop {
     background-color: #333636; }
 
 .grid-child {
@@ -4414,17 +4418,25 @@ headerbar.selection-mode button.titlebutton,
   .titlebar.selection-mode button.titlebutton:backdrop {
     icon-shadow: none; }
 
-.view:selected, calendar:selected, label:selected, label:selected:focus, label:selected:hover, .grid-child:selected, entry:selected, spinbutton:selected, entry:selected:focus, spinbutton:selected:focus, modelbutton.flat:selected,
+textview text:selected,
+.view:selected,
+calendar:selected, label:selected, label:selected:focus, label:selected:hover, .grid-child:selected, entry:selected, spinbutton:selected, entry:selected:focus, spinbutton:selected:focus, modelbutton.flat:selected,
 .menuitem.button.flat:selected, .list-row:selected, .sidebar:selected {
   background-color: #215d9c;
   color: #ffffff; }
-  .view:insensitive:selected, calendar:insensitive:selected, label:insensitive:selected, .grid-child:insensitive:selected, entry:insensitive:selected, spinbutton:insensitive:selected, modelbutton.flat:insensitive:selected,
+  textview text:insensitive:selected,
+  .view:insensitive:selected,
+  calendar:insensitive:selected, label:insensitive:selected, .grid-child:insensitive:selected, entry:insensitive:selected, spinbutton:insensitive:selected, modelbutton.flat:insensitive:selected,
   .menuitem.button.flat:insensitive:selected, .list-row:insensitive:selected, .sidebar:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive label {
     color: #90aece; }
-  .view:backdrop:selected, calendar:backdrop:selected, label:backdrop:selected, .grid-child:backdrop:selected, entry:backdrop:selected, spinbutton:backdrop:selected, modelbutton.flat:backdrop:selected,
+  textview text:backdrop:selected,
+  .view:backdrop:selected,
+  calendar:backdrop:selected, label:backdrop:selected, .grid-child:backdrop:selected, entry:backdrop:selected, spinbutton:backdrop:selected, modelbutton.flat:backdrop:selected,
   .menuitem.button.flat:backdrop:selected, .list-row:backdrop:selected, .sidebar:backdrop:selected {
     color: #ffffff; }
-    .view:backdrop:insensitive:selected, calendar:backdrop:insensitive:selected, label:backdrop:insensitive:selected, .grid-child:backdrop:insensitive:selected, entry:backdrop:insensitive:selected, spinbutton:backdrop:insensitive:selected, modelbutton.flat:backdrop:insensitive:selected,
+    textview text:backdrop:insensitive:selected,
+    .view:backdrop:insensitive:selected,
+    calendar:backdrop:insensitive:selected, label:backdrop:insensitive:selected, .grid-child:backdrop:insensitive:selected, entry:backdrop:insensitive:selected, spinbutton:backdrop:insensitive:selected, modelbutton.flat:backdrop:insensitive:selected,
     .menuitem.button.flat:backdrop:insensitive:selected, .list-row:backdrop:insensitive:selected, .sidebar:backdrop:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive label:backdrop, GtkPlacesSidebar.sidebar .list-row:selected:backdrop:insensitive label {
       color: #648eba; }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 8b491ef9ce..014e6f80fd 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -64,13 +64,17 @@
     background-color: #4a90d9;
     color: #ffffff; }
 
+textview text,
 .view {
   color: black;
   background-color: #ffffff; }
+  textview text:backdrop,
   .view:backdrop {
     color: #333333;
     background-color: white; }
-  .view:selected, calendar:selected {
+  textview text:selected,
+  .view:selected,
+  calendar:selected {
     border-radius: 3px; }
 
 .rubberband, treeview.view.rubberband, .content-view.rubberband {
@@ -108,9 +112,9 @@ assistant .sidebar label {
 assistant .sidebar label.highlight {
   background-color: #c7c8c8; }
 
-GtkTextView {
+textview {
   background-color: #f6f6f6; }
-  GtkTextView:backdrop {
+  textview:backdrop {
     background-color: #f6f6f6; }
 
 .grid-child {
@@ -4586,18 +4590,26 @@ headerbar.selection-mode button.titlebutton,
   .titlebar.selection-mode button.titlebutton:backdrop {
     icon-shadow: none; }
 
-.view:selected, calendar:selected, label:selected, label:selected:focus, label:selected:hover, .grid-child:selected, entry:selected, spinbutton:selected, entry:selected:focus, spinbutton:selected:focus, modelbutton.flat:selected,
+textview text:selected,
+.view:selected,
+calendar:selected, label:selected, label:selected:focus, label:selected:hover, .grid-child:selected, entry:selected, spinbutton:selected, entry:selected:focus, spinbutton:selected:focus, modelbutton.flat:selected,
 .menuitem.button.flat:selected, .list-row:selected, .sidebar:selected {
   background-color: #4a90d9;
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3); }
-  .view:insensitive:selected, calendar:insensitive:selected, label:insensitive:selected, .grid-child:insensitive:selected, entry:insensitive:selected, spinbutton:insensitive:selected, modelbutton.flat:insensitive:selected,
+  textview text:insensitive:selected,
+  .view:insensitive:selected,
+  calendar:insensitive:selected, label:insensitive:selected, .grid-child:insensitive:selected, entry:insensitive:selected, spinbutton:insensitive:selected, modelbutton.flat:insensitive:selected,
   .menuitem.button.flat:insensitive:selected, .list-row:insensitive:selected, .sidebar:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive label {
     color: #a5c8ec; }
-  .view:backdrop:selected, calendar:backdrop:selected, label:backdrop:selected, .grid-child:backdrop:selected, entry:backdrop:selected, spinbutton:backdrop:selected, modelbutton.flat:backdrop:selected,
+  textview text:backdrop:selected,
+  .view:backdrop:selected,
+  calendar:backdrop:selected, label:backdrop:selected, .grid-child:backdrop:selected, entry:backdrop:selected, spinbutton:backdrop:selected, modelbutton.flat:backdrop:selected,
   .menuitem.button.flat:backdrop:selected, .list-row:backdrop:selected, .sidebar:backdrop:selected {
     color: #ffffff; }
-    .view:backdrop:insensitive:selected, calendar:backdrop:insensitive:selected, label:backdrop:insensitive:selected, .grid-child:backdrop:insensitive:selected, entry:backdrop:insensitive:selected, spinbutton:backdrop:insensitive:selected, modelbutton.flat:backdrop:insensitive:selected,
+    textview text:backdrop:insensitive:selected,
+    .view:backdrop:insensitive:selected,
+    calendar:backdrop:insensitive:selected, label:backdrop:insensitive:selected, .grid-child:backdrop:insensitive:selected, entry:backdrop:insensitive:selected, spinbutton:backdrop:insensitive:selected, modelbutton.flat:backdrop:insensitive:selected,
     .menuitem.button.flat:backdrop:insensitive:selected, .list-row:backdrop:insensitive:selected, .sidebar:backdrop:insensitive:selected, GtkPlacesSidebar.sidebar .list-row:selected:insensitive label:backdrop, GtkPlacesSidebar.sidebar .list-row:selected:backdrop:insensitive label {
       color: #80b1e4; }