-PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-examples"
-FILES_${PN}-dev = "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a ${includedir}"
-FILES_${PN}-examples = "${bindir} ${datadir}"
+# This construction is stupid, someone with more E knowledge should change it to =+ or something
+PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests ${PN}-static"
+
+FILES_${PN} = "${libdir}/*.so.*"
+
+FILES_${PN}-themes = "${datadir}/${PN}/themes \
+ ${datadir}/${PN}/data \
+ ${datadir}/${PN}/fonts \
+ ${datadir}/${PN}/pointers \
+ ${datadir}/${PN}/images \
+ ${datadir}/${PN}/users \
+ ${datadir}/${PN}/images \
+ ${datadir}/${PN}/styles"
+
+FILES_${PN}-dev += "${bindir}/${PN}-config \
+ ${libdir}/pkgconfig/* \
+ ${libdir}/lib*.la \
+ ${libdir}/*.so \
+ ${libdir}/${PN}/*.la \
+ ${libdir}/${PN}/*/*.la \
+ ${datadir}/${PN}/edje_externals \
+"
+
+FILES_${PN}-static += "${libdir}/${PN}/*.a \
+ ${libdir}/${PN}/*/*.a \
+"
+
+FILES_${PN}-dbg += "${libdir}/${PN}/.debug \
+ ${libdir}/${PN}/*/.debug"
+
+FILES_${PN}-tests = "${bindir}/${PN} \
+ ${bindir}/*_* \
+ ${datadir}"