diff --git a/desktop/toolkit/gtk/gtk2/files/gtkrc b/desktop/toolkit/gtk/gtk2/files/gtkrc
index e5b4e26e98..50823f25ab 100644
--- a/desktop/toolkit/gtk/gtk2/files/gtkrc
+++ b/desktop/toolkit/gtk/gtk2/files/gtkrc
@@ -1,3 +1,3 @@
-gtk-icon-theme-name = "Faenza"
-gtk-theme-name = "MediterraneanLightDarkest"
-gtk-font-name = "DejaVuSans 10"
+gtk-icon-theme-name = "maia"
+gtk-theme-name = "maia"
+gtk-font-name = "Noto Sans 10"
diff --git a/desktop/toolkit/gtk/gtk3/actions.py b/desktop/toolkit/gtk/gtk3/actions.py
index 65194ceeca..c43821adb1 100644
--- a/desktop/toolkit/gtk/gtk3/actions.py
+++ b/desktop/toolkit/gtk/gtk3/actions.py
@@ -11,13 +11,10 @@ from pisi.actionsapi import shelltools
 
 
 def setup():
-    options = "--enable-x11-backend \
-               --enable-xinerama \
-               --enable-xkb \
-               --disable-silent-rules \
-               --disable-schemas-compile \
-               --enable-introspection \
-               --disable-papi \
+    options = "--prefix=/usr             \
+               --sysconfdir=/etc         \
+               --enable-x11-backend \
+               --enable-broadway-backend \
                --disable-wayland-backend \
               "
 
diff --git a/desktop/toolkit/gtk/gtk3/files/settings.ini b/desktop/toolkit/gtk/gtk3/files/settings.ini
index 36d8423477..8b4361b7d0 100644
--- a/desktop/toolkit/gtk/gtk3/files/settings.ini
+++ b/desktop/toolkit/gtk/gtk3/files/settings.ini
@@ -1,4 +1,4 @@
 [Settings]
-gtk-icon-theme-name = Faenza
-gtk-theme-name = MediterraneanLightDarkest
-gtk-font-name = DejaVuSans 10
+gtk-icon-theme-name = maia
+gtk-theme-name = maia
+gtk-font-name = Noto Sans 10
diff --git a/desktop/toolkit/gtk/gtk3/pspec.xml b/desktop/toolkit/gtk/gtk3/pspec.xml
index 5d8d2084bf..219fc97f46 100644
--- a/desktop/toolkit/gtk/gtk3/pspec.xml
+++ b/desktop/toolkit/gtk/gtk3/pspec.xml
@@ -12,7 +12,7 @@
         <License>LGPLv2.1</License>
         <Summary>The GIMP Toolkit version 3</Summary>
         <Description>GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites.</Description>
-        <Archive sha1sum="e7dd8a397031316c57b845bc76744ed5886385b1" type="tarxz">mirrors://gnome/gtk+/3.18/gtk+-3.18.6.tar.xz</Archive>
+        <Archive sha1sum="582185c07a5384362cb996bd9570440a9825b24f" type="tarxz">mirrors://gnome/gtk+/3.20/gtk+-3.20.4.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>atk-devel</Dependency>
 <!--             <Dependency>cups-devel</Dependency> --><!--It was disabled to avoid circle-->
@@ -35,10 +35,8 @@
             <Dependency>libepoxy-devel</Dependency>
             <Dependency>gtk-doc</Dependency>
             <Dependency>graphite2-devel</Dependency>
-
             <!--<Dependency>colord-devel</Dependency>-->
             <!--Dependency>librest-devel</Dependency>-->
-
         </BuildDependencies>
         <Patches>
             <Patch level="1">071_fix-installation-of-HTML-images.patch</Patch>
@@ -154,7 +152,7 @@
         </Files>
     </Package>
 
-    <!--Package>
+    <!--<Package>
         <Name>gtk3-32bit</Name>
         <PartOf>emul32</PartOf>
         <Summary>32-bit shared libraries for gtk3</Summary>
@@ -206,9 +204,16 @@
             <Path fileType="executable">/usr/bin/*-32bit</Path>
             <Path fileType="library">/usr/lib32</Path>
         </Files>
-    </Package-->
+    </Package>-->
 
      <History>
+         <Update release="3">
+            <Date>2016-06-06</Date>
+            <Version>3.20.4</Version>
+            <Comment>Version bump</Comment>
+            <Name>Osman Erkan</Name>
+            <Email>osman.erkan@pisilinux.org</Email>
+        </Update>
         <Update release="2">
             <Date>2016-04-30</Date>
             <Version>3.18.6</Version>