diff --git a/helpers/DATA/greybird-gtk-theme/mate.scss b/helpers/DATA/greybird-gtk-theme/mate.scss
index bb902300e4ccb693728053b8b780e3a80bbf2d53..058d521c1d376b32d6dbc37bf10ef3881f911ab2 100644
--- a/helpers/DATA/greybird-gtk-theme/mate.scss
+++ b/helpers/DATA/greybird-gtk-theme/mate.scss
@@ -74,6 +74,12 @@
     border-width: 1px 1px 1px 0px;
 }
 
+/* fix no cursor on dark theme*/
+.caja-desktop.view .entry,
+.caja-navigation-window .view .entry {
+    caret-color: #000;
+}
+
 /****************
  * Mate-Panel *
  ****************/
diff --git a/helpers/make-greybird-gtk-theme b/helpers/make-greybird-gtk-theme
index b9755d61b5f1b1487e17e285da6d030e2633353a..c45c5438ddeea99a40a800a6a83fa73540f1220f 100644
--- a/helpers/make-greybird-gtk-theme
+++ b/helpers/make-greybird-gtk-theme
@@ -16,8 +16,8 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-VERSION=7
-EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
+VERSION=8
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu $UPSTREAM main universe'
 
 . ./config