diff --git a/talimatname/genel/e19/talimat b/talimatname/genel/e21/talimat
similarity index 63%
rename from talimatname/genel/e19/talimat
rename to talimatname/genel/e21/talimat
index c54b51faa..c3dc42aef 100644
--- a/talimatname/genel/e19/talimat
+++ b/talimatname/genel/e21/talimat
@@ -1,12 +1,12 @@
-# Description: Enlightenment DR19 pencere yöneticisi
+# Description: Enlightenment DR21 pencere yöneticisi
 # URL: http://www.enlightenment.org/
 # Packager: milisarge
-# Depends on: elementary-e19 evas_generic_loaders-e19 xorg-xcb-util-keysyms dejavu-ttf
+# Depends on: elementary evas_generic_loaders xorg-xcb-util-keysyms dejavu-ttf
 
-name=e19
-version=0.19.14
+name=e21
+version=0.21.9
 release=1
-source=(http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-$version.tar.gz)
+source=(http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-$version.tar.xz)
 
 build()
 {
diff --git a/talimatname/genel/efl/talimat b/talimatname/genel/efl/talimat
index e8de83a8a..6a71ff65b 100644
--- a/talimatname/genel/efl/talimat
+++ b/talimatname/genel/efl/talimat
@@ -1,25 +1,25 @@
 # Description: efl kütüphaneleri
 # URL: http://www.enlightenment.org/
 # Packager: milisarge
-# Depends on: lua dbus libsndfile xorg-libxp xorg-libxscrnsaver gstreamer-plugins-base giflib libtiff gstreamer
+# Depends on: lua dbus libsndfile xorg-libxp xorg-libxscrnsaver gstreamer-plugins-base giflib libtiff gstreamer gstreamer1 poppler libspectre libraw librsvg gstreamer1-plugins-base
 
 name=efl
-version=1.8.6
+version=1.20.2
 release=1
-source=(http://download.enlightenment.org/rel/libs/$name/$name-$version.tar.gz
-	$name-$version-giflib.patch)
+source=(http://download.enlightenment.org/rel/libs/$name/$name-$version.tar.xz)
 
 build()
 {
     cd $name-$version 
-	patch -p1 -i $SRC/$name-$version-giflib.patch
-    ./autogen.sh --prefix=/usr \
+    ./configure --prefix=/usr \
                 --with-tests=none \
                 --disable-fribidi \
                 --disable-pulseaudio \
                 --disable-physics \
+                --disable-systemd \
 		        --disable-gstreamer \
 		        --enable-gstreamer1 \
+		        --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb \
                 --disable-doc
     make
     make -j1 DESTDIR=$PKG install
diff --git a/talimatname/genel/elementary-e19/talimat b/talimatname/genel/elementary/talimat
similarity index 67%
rename from talimatname/genel/elementary-e19/talimat
rename to talimatname/genel/elementary/talimat
index 92f15f800..6d51d0b25 100644
--- a/talimatname/genel/elementary-e19/talimat
+++ b/talimatname/genel/elementary/talimat
@@ -1,12 +1,12 @@
-# Description: e19 widget set
+# Description: enlightenment widget set
 # URL: http://www.enlightenment.org/
 # Packager: milisarge
-# Depends on: efl-e19 
+# Depends on: efl
 
-name=elementary-e19
-version=1.15.2
+name=elementary
+version=1.17.1
 release=1
-source=(http://download.enlightenment.org/rel/libs/elementary/elementary-$version.tar.gz)
+source=(http://download.enlightenment.org/rel/libs/elementary/elementary-$version.tar.xz)
 
 build()
 {
diff --git a/talimatname/genel/enlightenment/talimat b/talimatname/genel/enlightenment/talimat
index 4138356b9..0e4329569 100644
--- a/talimatname/genel/enlightenment/talimat
+++ b/talimatname/genel/enlightenment/talimat
@@ -1,7 +1,7 @@
 # Description: enlightenment masaüstü
 # URL:  sistem
 # Packager: milisarge
-# Depends on: bullet efl elementary-e19 evas_generic_loaders terminology-e19 e19 efl-e19 luajit
+# Depends on: bullet efl elementary evas_generic_loaders terminology e21 luajit
 
 name=enlightenment-sistem
 version=1
diff --git a/talimatname/genel/terminology-e19/talimat b/talimatname/genel/terminology/talimat
similarity index 77%
rename from talimatname/genel/terminology-e19/talimat
rename to talimatname/genel/terminology/talimat
index 9ce47dc10..5729e27df 100644
--- a/talimatname/genel/terminology-e19/talimat
+++ b/talimatname/genel/terminology/talimat
@@ -1,12 +1,12 @@
 # Description: terminal emulator 
 # URL: http://www.enlightenment.org/
 # Packager: milisarge
-# Depends on: elementary-e19
+# Depends on: elementary
 
-name=terminology-e19
-version=0.9.1
+name=terminology
+version=1.0.0
 release=1
-source=(http://download.enlightenment.org/rel/apps/terminology/terminology-$version.tar.gz)
+source=(http://download.enlightenment.org/rel/apps/terminology/terminology-$version.tar.xz)
 
 build()
 {