diff --git a/Paper/gtk-3.20/gtk-dark.css b/Paper/gtk-3.20/gtk-dark.css
index 39f0332..be2d98d 100644
--- a/Paper/gtk-3.20/gtk-dark.css
+++ b/Paper/gtk-3.20/gtk-dark.css
@@ -2269,7 +2269,7 @@ entry {
     box-shadow: none; }
   spinbutton.error:not(.vertical), GeditWindow > .error.entry,
   entry.error {
-    color: #d32f2f;
+    color: #ffffff;
     border-color: #420e0e; }
     spinbutton.error:focus:not(.vertical), GeditWindow > .error.entry:focus,
     entry.error:focus {
@@ -2281,7 +2281,7 @@ entry {
       background-color: #d32f2f; }
   spinbutton.warning:not(.vertical), GeditWindow > .warning.entry,
   entry.warning {
-    color: #f9ce1d;
+    color: #ffffff;
     border-color: #614e03; }
     spinbutton.warning:focus:not(.vertical), GeditWindow > .warning.entry:focus,
     entry.warning:focus {
diff --git a/Paper/gtk-3.20/gtk.css b/Paper/gtk-3.20/gtk.css
index 718b89e..6c936d1 100644
--- a/Paper/gtk-3.20/gtk.css
+++ b/Paper/gtk-3.20/gtk.css
@@ -2278,7 +2278,7 @@ entry {
     box-shadow: none; }
   spinbutton.error:not(.vertical), GeditWindow > .error.entry,
   entry.error {
-    color: #d32f2f;
+    color: #ffffff;
     border-color: #d32f2f; }
     spinbutton.error:focus:not(.vertical), GeditWindow > .error.entry:focus,
     entry.error:focus {
@@ -2290,7 +2290,7 @@ entry {
       background-color: #d32f2f; }
   spinbutton.warning:not(.vertical), GeditWindow > .warning.entry,
   entry.warning {
-    color: #f9ce1d;
+    color: #ffffff;
     border-color: #f9ce1d; }
     spinbutton.warning:focus:not(.vertical), GeditWindow > .warning.entry:focus,
     entry.warning:focus {
diff --git a/Paper/gtk-3.20/widgets/_entries.scss b/Paper/gtk-3.20/widgets/_entries.scss
index 4333c18..b1784db 100644
--- a/Paper/gtk-3.20/widgets/_entries.scss
+++ b/Paper/gtk-3.20/widgets/_entries.scss
@@ -52,7 +52,12 @@ entry {
     @each $e_type, $e_color in (error, $error_color),
                                (warning, $warning_color) {
       &.#{$e_type} {
-        color: $e_color;
+        // TODO consider using https://gist.github.com/jlong/f06f5843104ee10006fe for better color determination
+        @if (lightness($e_color) > 60) {
+          color: #000000;
+        } @else {
+          color: #ffffff;
+        }
         border-color: entry_focus_border($e_color);
 
         &:focus { @include entry(focus, $e_color); }