diff --git a/CMakeLists.txt b/CMakeLists.txt
index 411a07885..284d69002 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,10 +187,17 @@ install(FILES
   DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
   COMPONENT Devel
 )
+install(FILES
+            "${CMAKE_CURRENT_SOURCE_DIR}/PlasmaMacros.cmake"
+            "FindPlasma.cmake"
+        DESTINATION
+            ${DATA_INSTALL_DIR}/cmake/modules
+       )
+
 
 
 ################# list the subdirectories #################
-# add_subdirectory(src)
-# add_subdirectory( desktoptheme )
+add_subdirectory(src)
+add_subdirectory( desktoptheme )
 
 feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/FindPlasma.cmake b/FindPlasma.cmake
new file mode 100644
index 000000000..f28ac706f
--- /dev/null
+++ b/FindPlasma.cmake
@@ -0,0 +1,22 @@
+# - Try to find konqueror library
+# Once done this will define
+#
+#  PLASMA_FOUND - system has libkonq library
+#  PLASMA_INCLUDE_DIR - the PLASMA include directory
+#  PLASMA_LIBRARY - the libkonq library
+
+#  Original file: FindMarbleWidget.cmake (found in digikam-0.10.0-beta2)
+#  copyright 2008 by Patrick Spendrin <ps_ml@gmx.de>
+#  Copyright (c) 2009, Alexander Neundorf, <neundorf@kde.org>
+#  use this file as you like
+#
+#  Modifications to find libkonq by Joachim Eibl 2008
+
+find_path(PLASMA_INCLUDE_DIR plasma/plasma_export.h )
+
+find_library(PLASMA_LIBRARY plasma)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PLASMA  DEFAULT_MSG  PLASMA_INCLUDE_DIR PLASMA_LIBRARY )
+
+mark_as_advanced(PLASMA_INCLUDE_DIR PLASMA_LIBRARY)
diff --git a/PlasmaConfig.cmake.in b/PlasmaConfig.cmake.in
index d2cd498b2..8b7db907c 100644
--- a/PlasmaConfig.cmake.in
+++ b/PlasmaConfig.cmake.in
@@ -5,8 +5,12 @@
 set(Plasma_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@")
 set_and_check(Plasma_INCLUDE_DIR    "@PACKAGE_INCLUDE_INSTALL_DIR@")
 
-
+include("PlasmaMacros.cmake")
+#include("${CMAKE_CURRENT_SOURCE_DIR}/PlasmaMacros.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/PlasmaTargets.cmake")
 
-set(KArchive_LIBRARIES KF5::KArchive)
-set(KArchive_INCLUDE_DIRS ${KArchive_INCLUDE_DIR})
+
+macro(fsck)
+    message("FSCK!!!!")
+endmacro()
+
diff --git a/PlasmaMacros.cmake b/PlasmaMacros.cmake
new file mode 100644
index 000000000..8a202d3de
--- /dev/null
+++ b/PlasmaMacros.cmake
@@ -0,0 +1,18 @@
+
+
+
+find_package(KF5 MODULE REQUIRED COMPONENTS InstallDirs)
+
+macro(installPackage dir component)
+   set(root ${ARGV2})
+   set(type ${ARGV3})
+   if(NOT root)
+      set(root plasma/plasmoids)
+   endif()
+   if(NOT type)
+      set(type applet)
+   endif()
+   install(DIRECTORY ${dir}/ DESTINATION ${DATA_INSTALL_DIR}/${root}/${component} PATTERN .svn EXCLUDE PATTERN CMakeLists.txt EXCLUDE PATTERN Messages.sh EXCLUDE)
+   install(FILES ${dir}/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-${type}-${component}.desktop)
+endmacro()
+