diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000000000..98b4633bd
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,11 @@
+PROJECT(projectM-complete)
+cmake_minimum_required(VERSION 2.4.0)
+cmake_policy(SET CMP0005 OLD)
+
+if(COMMAND cmake_policy)
+       cmake_policy(SET CMP0003 NEW)
+endif(COMMAND cmake_policy)
+
+
+Include(src/cmake/CPack-projectM.cmake)
+
diff --git a/fonts/CMakeLists.txt b/fonts/CMakeLists.txt
new file mode 100644
index 000000000..9c199ab33
--- /dev/null
+++ b/fonts/CMakeLists.txt
@@ -0,0 +1,11 @@
+PROJECT(fonts)
+cmake_minimum_required(VERSION 2.4.0)
+cmake_policy(SET CMP0005 OLD)
+
+if(COMMAND cmake_policy)
+       cmake_policy(SET CMP0003 NEW)
+endif(COMMAND cmake_policy)
+
+
+Include(../src/cmake/CPack-projectM.cmake)
+
diff --git a/presets/CMakeLists.txt b/presets/CMakeLists.txt
index 0c310a2b4..1d6b4257b 100644
--- a/presets/CMakeLists.txt
+++ b/presets/CMakeLists.txt
@@ -7,14 +7,5 @@ if(COMMAND cmake_policy)
 endif(COMMAND cmake_policy)
 
 
-SET(CPACK_BINARY_RPM OFF)
-#SET(CPACK_BINARY_Z OFF)
-SET(CPACK_SOURCE_TGZ ON)
-SET(CPACK_BINARY_TGZ ON)
-#SET(CPACK_SOURCE_Z OFF)
-SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-
-Include(CPack)
+Include(../src/cmake/CPack-projectM.cmake)
 
diff --git a/presets_milkdrop/CMakeLists.txt b/presets_milkdrop/CMakeLists.txt
index 34324fe57..07ea26195 100644
--- a/presets_milkdrop/CMakeLists.txt
+++ b/presets_milkdrop/CMakeLists.txt
@@ -6,15 +6,4 @@ if(COMMAND cmake_policy)
        cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)
 
-
-SET(CPACK_BINARY_RPM OFF)
-#SET(CPACK_BINARY_Z OFF)
-SET(CPACK_SOURCE_TGZ ON)
-SET(CPACK_BINARY_TGZ ON)
-#SET(CPACK_SOURCE_Z OFF)
-SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-
-Include(CPack)
-
+Include(../src/cmake/CPack-projectM.cmake)
\ No newline at end of file
diff --git a/presets_milkdrop_104/CMakeLists.txt b/presets_milkdrop_104/CMakeLists.txt
index 393308a7b..252de572d 100644
--- a/presets_milkdrop_104/CMakeLists.txt
+++ b/presets_milkdrop_104/CMakeLists.txt
@@ -6,15 +6,4 @@ if(COMMAND cmake_policy)
        cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)
 
-
-SET(CPACK_BINARY_RPM OFF)
-#SET(CPACK_BINARY_Z OFF)
-SET(CPACK_SOURCE_TGZ ON)
-SET(CPACK_BINARY_TGZ ON)
-#SET(CPACK_SOURCE_Z OFF)
-SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-
-Include(CPack)
-
+Include(../src/cmake/CPack-projectM.cmake)
\ No newline at end of file
diff --git a/presets_milkdrop_200/CMakeLists.txt b/presets_milkdrop_200/CMakeLists.txt
index fe5c871f0..c8c9b0260 100644
--- a/presets_milkdrop_200/CMakeLists.txt
+++ b/presets_milkdrop_200/CMakeLists.txt
@@ -6,15 +6,4 @@ if(COMMAND cmake_policy)
        cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)
 
-
-SET(CPACK_BINARY_RPM OFF)
-#SET(CPACK_BINARY_Z OFF)
-SET(CPACK_SOURCE_TGZ ON)
-SET(CPACK_BINARY_TGZ ON)
-#SET(CPACK_SOURCE_Z OFF)
-SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-
-Include(CPack)
-
+Include(../src/cmake/CPack-projectM.cmake)
\ No newline at end of file
diff --git a/presets_projectM/CMakeLists.txt b/presets_projectM/CMakeLists.txt
index 905649872..5ff6fdcbf 100644
--- a/presets_projectM/CMakeLists.txt
+++ b/presets_projectM/CMakeLists.txt
@@ -7,14 +7,4 @@ if(COMMAND cmake_policy)
 endif(COMMAND cmake_policy)
 
 
-SET(CPACK_BINARY_RPM OFF)
-#SET(CPACK_BINARY_Z OFF)
-SET(CPACK_SOURCE_TGZ ON)
-SET(CPACK_BINARY_TGZ ON)
-#SET(CPACK_SOURCE_Z OFF)
-SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-
-Include(CPack)
-
+Include(../src/cmake/CPack-projectM.cmake)
\ No newline at end of file
diff --git a/projectMTrunk.kdevelop.filelist b/projectMTrunk.kdevelop.filelist
index 2f35ea7db..654e8c91a 100644
--- a/projectMTrunk.kdevelop.filelist
+++ b/projectMTrunk.kdevelop.filelist
@@ -1,5 +1,100 @@
 # KDevelop Custom Project File List
 lic.c
+presets
+presets/CMakeFiles
+presets/CMakeFiles/CompilerIdC
+presets/CMakeFiles/CompilerIdC/CMakeCCompilerId.c
+presets/CMakeFiles/CompilerIdCXX
+presets/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
+presets/CMakeLists.txt
+presets/Makefile
+presets/_CPack_Packages
+presets/_CPack_Packages/Linux-Source
+presets/_CPack_Packages/Linux-Source/TGZ
+presets/_CPack_Packages/Linux-Source/TGZ/presets-2.0.0-Source
+presets/_CPack_Packages/Linux-Source/TGZ/presets-2.0.0-Source/CMakeFiles
+presets/_CPack_Packages/Linux-Source/TGZ/presets-2.0.0-Source/CMakeFiles/CompilerIdC
+presets/_CPack_Packages/Linux-Source/TGZ/presets-2.0.0-Source/CMakeFiles/CompilerIdC/CMakeCCompilerId.c
+presets/_CPack_Packages/Linux-Source/TGZ/presets-2.0.0-Source/CMakeFiles/CompilerIdCXX
+presets/_CPack_Packages/Linux-Source/TGZ/presets-2.0.0-Source/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
+presets/_CPack_Packages/Linux-Source/TGZ/presets-2.0.0-Source/CMakeLists.txt
+presets/_CPack_Packages/Linux-Source/TGZ/presets-2.0.0-Source/Makefile
+presets_milkdrop
+presets_milkdrop/CMakeFiles
+presets_milkdrop/CMakeFiles/CompilerIdC
+presets_milkdrop/CMakeFiles/CompilerIdC/CMakeCCompilerId.c
+presets_milkdrop/CMakeFiles/CompilerIdCXX
+presets_milkdrop/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
+presets_milkdrop/CMakeLists.txt
+presets_milkdrop/Makefile
+presets_milkdrop/_CPack_Packages
+presets_milkdrop/_CPack_Packages/Linux-Source
+presets_milkdrop/_CPack_Packages/Linux-Source/TGZ
+presets_milkdrop/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop-2.0.0-Source
+presets_milkdrop/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop-2.0.0-Source/CMakeFiles
+presets_milkdrop/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop-2.0.0-Source/CMakeFiles/CompilerIdC
+presets_milkdrop/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop-2.0.0-Source/CMakeFiles/CompilerIdC/CMakeCCompilerId.c
+presets_milkdrop/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop-2.0.0-Source/CMakeFiles/CompilerIdCXX
+presets_milkdrop/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop-2.0.0-Source/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
+presets_milkdrop/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop-2.0.0-Source/CMakeLists.txt
+presets_milkdrop/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop-2.0.0-Source/Makefile
+presets_milkdrop_104
+presets_milkdrop_104/CMakeFiles
+presets_milkdrop_104/CMakeFiles/CompilerIdC
+presets_milkdrop_104/CMakeFiles/CompilerIdC/CMakeCCompilerId.c
+presets_milkdrop_104/CMakeFiles/CompilerIdCXX
+presets_milkdrop_104/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
+presets_milkdrop_104/CMakeLists.txt
+presets_milkdrop_104/Makefile
+presets_milkdrop_104/_CPack_Packages
+presets_milkdrop_104/_CPack_Packages/Linux-Source
+presets_milkdrop_104/_CPack_Packages/Linux-Source/TGZ
+presets_milkdrop_104/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop_104-2.0.0-Source
+presets_milkdrop_104/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop_104-2.0.0-Source/CMakeFiles
+presets_milkdrop_104/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop_104-2.0.0-Source/CMakeFiles/CompilerIdC
+presets_milkdrop_104/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop_104-2.0.0-Source/CMakeFiles/CompilerIdC/CMakeCCompilerId.c
+presets_milkdrop_104/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop_104-2.0.0-Source/CMakeFiles/CompilerIdCXX
+presets_milkdrop_104/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop_104-2.0.0-Source/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
+presets_milkdrop_104/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop_104-2.0.0-Source/CMakeLists.txt
+presets_milkdrop_104/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop_104-2.0.0-Source/Makefile
+presets_milkdrop_200
+presets_milkdrop_200/CMakeFiles
+presets_milkdrop_200/CMakeFiles/CompilerIdC
+presets_milkdrop_200/CMakeFiles/CompilerIdC/CMakeCCompilerId.c
+presets_milkdrop_200/CMakeFiles/CompilerIdCXX
+presets_milkdrop_200/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
+presets_milkdrop_200/CMakeLists.txt
+presets_milkdrop_200/Makefile
+presets_milkdrop_200/_CPack_Packages
+presets_milkdrop_200/_CPack_Packages/Linux-Source
+presets_milkdrop_200/_CPack_Packages/Linux-Source/TGZ
+presets_milkdrop_200/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop_200-2.0.0-Source
+presets_milkdrop_200/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop_200-2.0.0-Source/CMakeFiles
+presets_milkdrop_200/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop_200-2.0.0-Source/CMakeFiles/CompilerIdC
+presets_milkdrop_200/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop_200-2.0.0-Source/CMakeFiles/CompilerIdC/CMakeCCompilerId.c
+presets_milkdrop_200/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop_200-2.0.0-Source/CMakeFiles/CompilerIdCXX
+presets_milkdrop_200/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop_200-2.0.0-Source/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
+presets_milkdrop_200/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop_200-2.0.0-Source/CMakeLists.txt
+presets_milkdrop_200/_CPack_Packages/Linux-Source/TGZ/presets_milkdrop_200-2.0.0-Source/Makefile
+presets_projectM
+presets_projectM/CMakeFiles
+presets_projectM/CMakeFiles/CompilerIdC
+presets_projectM/CMakeFiles/CompilerIdC/CMakeCCompilerId.c
+presets_projectM/CMakeFiles/CompilerIdCXX
+presets_projectM/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
+presets_projectM/CMakeLists.txt
+presets_projectM/Makefile
+presets_projectM/_CPack_Packages
+presets_projectM/_CPack_Packages/Linux-Source
+presets_projectM/_CPack_Packages/Linux-Source/TGZ
+presets_projectM/_CPack_Packages/Linux-Source/TGZ/presets-projectm-2.0.0-Source
+presets_projectM/_CPack_Packages/Linux-Source/TGZ/presets-projectm-2.0.0-Source/CMakeFiles
+presets_projectM/_CPack_Packages/Linux-Source/TGZ/presets-projectm-2.0.0-Source/CMakeFiles/CompilerIdC
+presets_projectM/_CPack_Packages/Linux-Source/TGZ/presets-projectm-2.0.0-Source/CMakeFiles/CompilerIdC/CMakeCCompilerId.c
+presets_projectM/_CPack_Packages/Linux-Source/TGZ/presets-projectm-2.0.0-Source/CMakeFiles/CompilerIdCXX
+presets_projectM/_CPack_Packages/Linux-Source/TGZ/presets-projectm-2.0.0-Source/CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp
+presets_projectM/_CPack_Packages/Linux-Source/TGZ/presets-projectm-2.0.0-Source/CMakeLists.txt
+presets_projectM/_CPack_Packages/Linux-Source/TGZ/presets-projectm-2.0.0-Source/Makefile
 src
 src/CMakeLists.txt
 src/Makefile
@@ -751,7 +846,6 @@ src/projectM-jack
 src/projectM-jack/CMakeLists.txt
 src/projectM-jack/ConfigFile.cpp
 src/projectM-jack/ConfigFile.h
-src/projectM-jack/Makefile
 src/projectM-jack/projectM-jack.cpp
 src/projectM-jack/qprojectM-jack.cpp
 src/projectM-jack/sdltoprojectM.h
@@ -779,11 +873,7 @@ src/projectM-pulseaudio/QPulseAudioDeviceModel.cpp
 src/projectM-pulseaudio/QPulseAudioDeviceModel.hpp
 src/projectM-pulseaudio/QPulseAudioThread.cpp
 src/projectM-pulseaudio/QPulseAudioThread.hpp
-src/projectM-pulseaudio/moc_QPulseAudioDeviceChooser.cxx
-src/projectM-pulseaudio/moc_QPulseAudioDeviceModel.cxx
-src/projectM-pulseaudio/moc_QPulseAudioThread.cxx
 src/projectM-pulseaudio/qprojectM-pulseaudio.cpp
-src/projectM-pulseaudio/ui_PulseDeviceChooserDialog.h
 src/projectM-qt
 src/projectM-qt/CMakeLists.txt
 src/projectM-qt/Makefile
@@ -792,16 +882,6 @@ src/projectM-qt/configfile.hpp
 src/projectM-qt/images
 src/projectM-qt/images/icons
 src/projectM-qt/images/icons/CMakeLists.txt
-src/projectM-qt/moc_qplaylistfiledialog.cxx
-src/projectM-qt/moc_qplaylistmodel.cxx
-src/projectM-qt/moc_qplaylisttableview.cxx
-src/projectM-qt/moc_qpreseteditordialog.cxx
-src/projectM-qt/moc_qpresetfiledialog.cxx
-src/projectM-qt/moc_qpresettextedit.cxx
-src/projectM-qt/moc_qprojectm.cxx
-src/projectM-qt/moc_qprojectm_mainwindow.cxx
-src/projectM-qt/moc_qprojectmconfigdialog.cxx
-src/projectM-qt/moc_qprojectmwidget.cxx
 src/projectM-qt/nullable.hpp
 src/projectM-qt/qplaylistfiledialog.cpp
 src/projectM-qt/qplaylistfiledialog.hpp
@@ -819,11 +899,7 @@ src/projectM-qt/qprojectm_mainwindow.hpp
 src/projectM-qt/qprojectmconfigdialog.cpp
 src/projectM-qt/qprojectmconfigdialog.hpp
 src/projectM-qt/qprojectmwidget.hpp
-src/projectM-qt/qrc_application.cxx
 src/projectM-qt/qxmlplaylisthandler.hpp
-src/projectM-qt/ui_qpreseteditordialog.h
-src/projectM-qt/ui_qprojectm_mainwindow.h
-src/projectM-qt/ui_qprojectmconfigdialog.h
 src/projectM-screensaver
 src/projectM-screensaver/resource.h
 src/projectM-screensaver/tsaver.h
diff --git a/projectMTrunk.kdevelop.pcs b/projectMTrunk.kdevelop.pcs
index 1ee90a7d7..9250e1c3e 100644
Binary files a/projectMTrunk.kdevelop.pcs and b/projectMTrunk.kdevelop.pcs differ
diff --git a/projectMTrunk.kdevses b/projectMTrunk.kdevses
index 862c35621..7bf5d56e1 100644
--- a/projectMTrunk.kdevses
+++ b/projectMTrunk.kdevses
@@ -1,7 +1,7 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="12" >
+ <DocsAndViews NumberOfDocuments="21" >
   <Doc0 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/MilkdropPresetFactory/PerPixelEqn.cpp" >
    <View0 Encoding="" Type="Source" />
   </Doc0>
@@ -36,8 +36,35 @@
    <View0 Encoding="" Type="Source" />
   </Doc10>
   <Doc11 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/projectM-jack/qprojectM-jack.cpp" >
-   <View0 Encoding="" line="172" Type="Source" />
+   <View0 Encoding="" Type="Source" />
   </Doc11>
+  <Doc12 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/projectM.cpp" >
+   <View0 Encoding="" Type="Source" />
+  </Doc12>
+  <Doc13 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/PresetChooser.cpp" >
+   <View0 Encoding="" Type="Source" />
+  </Doc13>
+  <Doc14 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/PresetChooser.hpp" >
+   <View0 Encoding="" Type="Source" />
+  </Doc14>
+  <Doc15 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/RandomNumberGenerators.hpp" >
+   <View0 Encoding="" Type="Source" />
+  </Doc15>
+  <Doc16 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/projectM.hpp" >
+   <View0 Encoding="" Type="Source" />
+  </Doc16>
+  <Doc17 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/PresetLoader.cpp" >
+   <View0 Encoding="" Type="Source" />
+  </Doc17>
+  <Doc18 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/MilkdropPresetFactory/MilkdropPreset.hpp" >
+   <View0 Encoding="" Type="Source" />
+  </Doc18>
+  <Doc19 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/MilkdropPresetFactory/PerFrameEqn.cpp" >
+   <View0 Encoding="" Type="Source" />
+  </Doc19>
+  <Doc20 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/MilkdropPresetFactory/Parser.hpp" >
+   <View0 Encoding="" line="173" Type="Source" />
+  </Doc20>
  </DocsAndViews>
  <pluginList>
   <kdevdebugger>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9e39665c1..038f5e34e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,18 +2,6 @@ project (PROJECTM_ROOT)
 
 cmake_minimum_required(VERSION 2.4.0)
 
-
-SET(CPACK_BINARY_RPM OFF)
-#SET(CPACK_BINARY_Z OFF)
-SET(CPACK_SOURCE_TGZ ON)
-SET(CPACK_BINARY_TGZ ON)
-#SET(CPACK_SOURCE_Z OFF)
-SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-SET(CPACK_PACKAGE_NAME "projectM-complete")
-INCLUDE(CPack)
-
 OPTION(INCLUDE-PROJECTM-QT "Build the projectM Qt4 user interface extension library (recommended)" ON)
 OPTION(INCLUDE-PROJECTM-PULSEAUDIO "Build the projectM pulse audio client (recommended for fedora users)" ON)
 OPTION(INCLUDE-PROJECTM-LIBVISUAL "Build the projectM libvisual client" ON)
diff --git a/src/NativePresets/CMakeLists.txt b/src/NativePresets/CMakeLists.txt
index f0af8b0e4..9a6e50664 100644
--- a/src/NativePresets/CMakeLists.txt
+++ b/src/NativePresets/CMakeLists.txt
@@ -4,17 +4,7 @@ cmake_policy(SET CMP0005 OLD)
 
 include(FindPkgConfig.cmake)
 
-
-SET(CPACK_BINARY_RPM OFF)
-#SET(CPACK_BINARY_Z OFF)
-SET(CPACK_SOURCE_TGZ ON)
-SET(CPACK_BINARY_TGZ ON)
-#SET(CPACK_SOURCE_Z OFF)
-SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-
-Include(CPack)
+Include(cmake/CPack-projectM.cmake)
 
 if (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
 	set(LIBPROJECTM_FOUND true)
diff --git a/src/NativePresets/cmake/CPack-projectM.cmake b/src/NativePresets/cmake/CPack-projectM.cmake
new file mode 100644
index 000000000..3292a9c29
--- /dev/null
+++ b/src/NativePresets/cmake/CPack-projectM.cmake
@@ -0,0 +1,24 @@
+#CPACK projectM config
+
+SET(CPACK_GENERATORS "TGZ")
+SET(CPACK_SOURCE_GENERATORS "TGZ")
+SET(CPACK_STRIP_FILES ON)
+#SET(CPACK_IGNORE_FILES 
+ # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o")
+SET(CPACK_SOURCE_IGNORE_FILES 
+  "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip")
+
+#SET(CPACK_BINARY_RPM OFF)
+# #SET(CPACK_BINARY_Z OFF)
+#SET(CPACK_SOURCE_TGZ ON)
+SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_SOURCE_TZ OFF)
+SET(CPACK_SOURCE_TBZ2 ON)
+#SET(CPACK_BINARY_TGZ ON)
+#SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_PACKAGE_VERSION_MAJOR "2")
+SET(CPACK_PACKAGE_VERSION_MINOR "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
+
+INCLUDE(CPack)
+
diff --git a/src/README b/src/README
index feae9731c..b95e1e781 100644
--- a/src/README
+++ b/src/README
@@ -4,7 +4,7 @@ NOTE: The projectM wiki at http://projectm.wiki.sourceforge.net/ is the official
 
 (1) How to configure the projectM build
 
-In the "src" directory from where you extracted projectM, run
+In the top level directory from where you extracted projectM, run
 
 ccmake .
 
diff --git a/src/cmake/CPack-projectM.cmake b/src/cmake/CPack-projectM.cmake
new file mode 100644
index 000000000..3292a9c29
--- /dev/null
+++ b/src/cmake/CPack-projectM.cmake
@@ -0,0 +1,24 @@
+#CPACK projectM config
+
+SET(CPACK_GENERATORS "TGZ")
+SET(CPACK_SOURCE_GENERATORS "TGZ")
+SET(CPACK_STRIP_FILES ON)
+#SET(CPACK_IGNORE_FILES 
+ # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o")
+SET(CPACK_SOURCE_IGNORE_FILES 
+  "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip")
+
+#SET(CPACK_BINARY_RPM OFF)
+# #SET(CPACK_BINARY_Z OFF)
+#SET(CPACK_SOURCE_TGZ ON)
+SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_SOURCE_TZ OFF)
+SET(CPACK_SOURCE_TBZ2 ON)
+#SET(CPACK_BINARY_TGZ ON)
+#SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_PACKAGE_VERSION_MAJOR "2")
+SET(CPACK_PACKAGE_VERSION_MINOR "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
+
+INCLUDE(CPack)
+
diff --git a/src/projectM-jack/CMakeLists.txt b/src/projectM-jack/CMakeLists.txt
index 5514ec32e..3414d9ef4 100644
--- a/src/projectM-jack/CMakeLists.txt
+++ b/src/projectM-jack/CMakeLists.txt
@@ -3,15 +3,7 @@ cmake_minimum_required(VERSION 2.4.0)
 
 cmake_policy(SET CMP0005 OLD)
 
-SET(CPACK_BINARY_RPM OFF)
-#SET(CPACK_BINARY_Z OFF)
-SET(CPACK_SOURCE_TGZ ON)
-SET(CPACK_BINARY_TGZ ON)
-#SET(CPACK_SOURCE_Z OFF)
-SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-INCLUDE(CPack)
+INCLUDE(cmake/CPack-projectM.cmake)
 
 
 OPTION(QT_JACK_SUPPORT "Enable Qt4 GUI Support for the projectM jack port" ON)
diff --git a/src/projectM-jack/cmake/CPack-projectM.cmake b/src/projectM-jack/cmake/CPack-projectM.cmake
new file mode 100644
index 000000000..3292a9c29
--- /dev/null
+++ b/src/projectM-jack/cmake/CPack-projectM.cmake
@@ -0,0 +1,24 @@
+#CPACK projectM config
+
+SET(CPACK_GENERATORS "TGZ")
+SET(CPACK_SOURCE_GENERATORS "TGZ")
+SET(CPACK_STRIP_FILES ON)
+#SET(CPACK_IGNORE_FILES 
+ # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o")
+SET(CPACK_SOURCE_IGNORE_FILES 
+  "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip")
+
+#SET(CPACK_BINARY_RPM OFF)
+# #SET(CPACK_BINARY_Z OFF)
+#SET(CPACK_SOURCE_TGZ ON)
+SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_SOURCE_TZ OFF)
+SET(CPACK_SOURCE_TBZ2 ON)
+#SET(CPACK_BINARY_TGZ ON)
+#SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_PACKAGE_VERSION_MAJOR "2")
+SET(CPACK_PACKAGE_VERSION_MINOR "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
+
+INCLUDE(CPack)
+
diff --git a/src/projectM-libvisual-alsa/CMakeLists.txt b/src/projectM-libvisual-alsa/CMakeLists.txt
index f534cd003..b1c2f3088 100644
--- a/src/projectM-libvisual-alsa/CMakeLists.txt
+++ b/src/projectM-libvisual-alsa/CMakeLists.txt
@@ -10,18 +10,7 @@ INCLUDE(FindPkgConfig.cmake)
 FIND_PACKAGE(OpenGL)
 FIND_PACKAGE(SDL)
 FIND_PACKAGE(X11)
-
-
-SET(CPACK_BINARY_RPM OFF)
-#SET(CPACK_BINARY_Z OFF)
-SET(CPACK_SOURCE_TGZ ON)
-SET(CPACK_BINARY_TGZ ON)
-#SET(CPACK_SOURCE_Z OFF)
-SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-
-INCLUDE(CPack)
+INCLUDE(cmake/CPack-projectM.cmake)
 
 if (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME})
 	pkg_search_module(LIBPROJECTM REQUIRED libprojectM)
diff --git a/src/projectM-libvisual-alsa/cmake/CPack-projectM.cmake b/src/projectM-libvisual-alsa/cmake/CPack-projectM.cmake
new file mode 100644
index 000000000..3292a9c29
--- /dev/null
+++ b/src/projectM-libvisual-alsa/cmake/CPack-projectM.cmake
@@ -0,0 +1,24 @@
+#CPACK projectM config
+
+SET(CPACK_GENERATORS "TGZ")
+SET(CPACK_SOURCE_GENERATORS "TGZ")
+SET(CPACK_STRIP_FILES ON)
+#SET(CPACK_IGNORE_FILES 
+ # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o")
+SET(CPACK_SOURCE_IGNORE_FILES 
+  "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip")
+
+#SET(CPACK_BINARY_RPM OFF)
+# #SET(CPACK_BINARY_Z OFF)
+#SET(CPACK_SOURCE_TGZ ON)
+SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_SOURCE_TZ OFF)
+SET(CPACK_SOURCE_TBZ2 ON)
+#SET(CPACK_BINARY_TGZ ON)
+#SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_PACKAGE_VERSION_MAJOR "2")
+SET(CPACK_PACKAGE_VERSION_MINOR "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
+
+INCLUDE(CPack)
+
diff --git a/src/projectM-libvisual/CMakeLists.txt b/src/projectM-libvisual/CMakeLists.txt
index 4d747229a..f9a947ab9 100644
--- a/src/projectM-libvisual/CMakeLists.txt
+++ b/src/projectM-libvisual/CMakeLists.txt
@@ -5,16 +5,7 @@ cmake_minimum_required(VERSION 2.4.0)
     endif(COMMAND cmake_policy)    
 
 
-SET(CPACK_BINARY_RPM OFF)
-#SET(CPACK_BINARY_Z OFF)
-SET(CPACK_SOURCE_TGZ ON)
-SET(CPACK_BINARY_TGZ ON)
-#SET(CPACK_SOURCE_Z OFF)
-SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-
-INCLUDE(CPack)
+INCLUDE(cmake/CPack-projectM.cmake)
 
 
 ADD_LIBRARY(projectM_libvisual SHARED actor_projectM.cpp lvtoprojectM.h ConfigFile.h ConfigFile.cpp)
diff --git a/src/projectM-libvisual/cmake/CPack-projectM.cmake b/src/projectM-libvisual/cmake/CPack-projectM.cmake
new file mode 100644
index 000000000..3292a9c29
--- /dev/null
+++ b/src/projectM-libvisual/cmake/CPack-projectM.cmake
@@ -0,0 +1,24 @@
+#CPACK projectM config
+
+SET(CPACK_GENERATORS "TGZ")
+SET(CPACK_SOURCE_GENERATORS "TGZ")
+SET(CPACK_STRIP_FILES ON)
+#SET(CPACK_IGNORE_FILES 
+ # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o")
+SET(CPACK_SOURCE_IGNORE_FILES 
+  "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip")
+
+#SET(CPACK_BINARY_RPM OFF)
+# #SET(CPACK_BINARY_Z OFF)
+#SET(CPACK_SOURCE_TGZ ON)
+SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_SOURCE_TZ OFF)
+SET(CPACK_SOURCE_TBZ2 ON)
+#SET(CPACK_BINARY_TGZ ON)
+#SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_PACKAGE_VERSION_MAJOR "2")
+SET(CPACK_PACKAGE_VERSION_MINOR "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
+
+INCLUDE(CPack)
+
diff --git a/src/projectM-pulseaudio/CMakeLists.txt b/src/projectM-pulseaudio/CMakeLists.txt
index 431188e17..16898b0f1 100644
--- a/src/projectM-pulseaudio/CMakeLists.txt
+++ b/src/projectM-pulseaudio/CMakeLists.txt
@@ -2,16 +2,7 @@ PROJECT(projectM-pulseaudio)
 
 cmake_minimum_required(VERSION 2.4.0)
 
-
-SET(CPACK_BINARY_RPM OFF)
-#SET(CPACK_BINARY_Z OFF)
-SET(CPACK_SOURCE_TGZ ON)
-SET(CPACK_BINARY_TGZ ON)
-#SET(CPACK_SOURCE_Z OFF)
-SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-Include(CPack)
+Include(cmake/CPack-projectM.cmake)
 
 set(QT_USE_OPENGL TRUE)
 
diff --git a/src/projectM-pulseaudio/cmake/CPack-projectM.cmake b/src/projectM-pulseaudio/cmake/CPack-projectM.cmake
new file mode 100644
index 000000000..3292a9c29
--- /dev/null
+++ b/src/projectM-pulseaudio/cmake/CPack-projectM.cmake
@@ -0,0 +1,24 @@
+#CPACK projectM config
+
+SET(CPACK_GENERATORS "TGZ")
+SET(CPACK_SOURCE_GENERATORS "TGZ")
+SET(CPACK_STRIP_FILES ON)
+#SET(CPACK_IGNORE_FILES 
+ # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o")
+SET(CPACK_SOURCE_IGNORE_FILES 
+  "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip")
+
+#SET(CPACK_BINARY_RPM OFF)
+# #SET(CPACK_BINARY_Z OFF)
+#SET(CPACK_SOURCE_TGZ ON)
+SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_SOURCE_TZ OFF)
+SET(CPACK_SOURCE_TBZ2 ON)
+#SET(CPACK_BINARY_TGZ ON)
+#SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_PACKAGE_VERSION_MAJOR "2")
+SET(CPACK_PACKAGE_VERSION_MINOR "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
+
+INCLUDE(CPack)
+
diff --git a/src/projectM-qt/CMakeLists.txt b/src/projectM-qt/CMakeLists.txt
index 41ba80017..240f87fd5 100644
--- a/src/projectM-qt/CMakeLists.txt
+++ b/src/projectM-qt/CMakeLists.txt
@@ -3,15 +3,7 @@ project(projectM-qt) # the name of your project
 cmake_minimum_required(VERSION 2.4.0)
 cmake_policy(SET CMP0005 OLD)
 
-SET(CPACK_BINARY_RPM OFF)
-#SET(CPACK_BINARY_Z OFF)
-SET(CPACK_SOURCE_TGZ ON)
-SET(CPACK_BINARY_TGZ ON)
-#SET(CPACK_SOURCE_Z OFF)
-SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-include(CPack)
+include(cmake/CPack-projectM.cmake)
 
 include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )
 include(FindPkgConfig.cmake)
diff --git a/src/projectM-qt/cmake/CPack-projectM.cmake b/src/projectM-qt/cmake/CPack-projectM.cmake
new file mode 100644
index 000000000..3292a9c29
--- /dev/null
+++ b/src/projectM-qt/cmake/CPack-projectM.cmake
@@ -0,0 +1,24 @@
+#CPACK projectM config
+
+SET(CPACK_GENERATORS "TGZ")
+SET(CPACK_SOURCE_GENERATORS "TGZ")
+SET(CPACK_STRIP_FILES ON)
+#SET(CPACK_IGNORE_FILES 
+ # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o")
+SET(CPACK_SOURCE_IGNORE_FILES 
+  "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip")
+
+#SET(CPACK_BINARY_RPM OFF)
+# #SET(CPACK_BINARY_Z OFF)
+#SET(CPACK_SOURCE_TGZ ON)
+SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_SOURCE_TZ OFF)
+SET(CPACK_SOURCE_TBZ2 ON)
+#SET(CPACK_BINARY_TGZ ON)
+#SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_PACKAGE_VERSION_MAJOR "2")
+SET(CPACK_PACKAGE_VERSION_MINOR "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
+
+INCLUDE(CPack)
+
diff --git a/src/projectM-test/CMakeLists.txt b/src/projectM-test/CMakeLists.txt
index dddb5765f..55cf10170 100644
--- a/src/projectM-test/CMakeLists.txt
+++ b/src/projectM-test/CMakeLists.txt
@@ -7,16 +7,7 @@ if(COMMAND cmake_policy)
 endif(COMMAND cmake_policy)
 
 
-SET(CPACK_BINARY_RPM OFF)
-#SET(CPACK_BINARY_Z OFF)
-SET(CPACK_SOURCE_TGZ ON)
-SET(CPACK_BINARY_TGZ ON)
-#SET(CPACK_SOURCE_Z OFF)
-SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-
-Include(CPack)
+INCLUDE(cmake/CPack-projectM.cmake)
 
 ADD_EXECUTABLE(projectM-test         projectM-test.cpp         sdltoprojectM.h video_init.cpp ConfigFile.h ConfigFile.cpp getConfigFilename.cpp getConfigFilename.h)
 ADD_EXECUTABLE(projectM-test-memleak projectM-test-memleak.cpp sdltoprojectM.h video_init.cpp ConfigFile.h ConfigFile.cpp getConfigFilename.cpp getConfigFilename.h)
diff --git a/src/projectM-test/cmake/CPack-projectM.cmake b/src/projectM-test/cmake/CPack-projectM.cmake
new file mode 100644
index 000000000..3292a9c29
--- /dev/null
+++ b/src/projectM-test/cmake/CPack-projectM.cmake
@@ -0,0 +1,24 @@
+#CPACK projectM config
+
+SET(CPACK_GENERATORS "TGZ")
+SET(CPACK_SOURCE_GENERATORS "TGZ")
+SET(CPACK_STRIP_FILES ON)
+#SET(CPACK_IGNORE_FILES 
+ # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o")
+SET(CPACK_SOURCE_IGNORE_FILES 
+  "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip")
+
+#SET(CPACK_BINARY_RPM OFF)
+# #SET(CPACK_BINARY_Z OFF)
+#SET(CPACK_SOURCE_TGZ ON)
+SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_SOURCE_TZ OFF)
+SET(CPACK_SOURCE_TBZ2 ON)
+#SET(CPACK_BINARY_TGZ ON)
+#SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_PACKAGE_VERSION_MAJOR "2")
+SET(CPACK_PACKAGE_VERSION_MINOR "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
+
+INCLUDE(CPack)
+
diff --git a/src/projectM-xmms/CMakeLists.txt b/src/projectM-xmms/CMakeLists.txt
index e02df148a..cbb8e5411 100644
--- a/src/projectM-xmms/CMakeLists.txt
+++ b/src/projectM-xmms/CMakeLists.txt
@@ -6,6 +6,8 @@ cmake_minimum_required(VERSION 2.4.0)
 
 INCLUDE(FindPkgConfig.cmake)
 
+INCLUDE(cmake/CPack-projectM.cmake)
+
 FIND_PACKAGE(OpenGL)
 FIND_PACKAGE(GTK)
 FIND_PACKAGE(SDL)
diff --git a/src/projectM-xmms/cmake/CPack-projectM.cmake b/src/projectM-xmms/cmake/CPack-projectM.cmake
new file mode 100644
index 000000000..3292a9c29
--- /dev/null
+++ b/src/projectM-xmms/cmake/CPack-projectM.cmake
@@ -0,0 +1,24 @@
+#CPACK projectM config
+
+SET(CPACK_GENERATORS "TGZ")
+SET(CPACK_SOURCE_GENERATORS "TGZ")
+SET(CPACK_STRIP_FILES ON)
+#SET(CPACK_IGNORE_FILES 
+ # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o")
+SET(CPACK_SOURCE_IGNORE_FILES 
+  "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip")
+
+#SET(CPACK_BINARY_RPM OFF)
+# #SET(CPACK_BINARY_Z OFF)
+#SET(CPACK_SOURCE_TGZ ON)
+SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_SOURCE_TZ OFF)
+SET(CPACK_SOURCE_TBZ2 ON)
+#SET(CPACK_BINARY_TGZ ON)
+#SET(CPACK_SOURCE_Z OFF)
+SET(CPACK_PACKAGE_VERSION_MAJOR "2")
+SET(CPACK_PACKAGE_VERSION_MINOR "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
+
+INCLUDE(CPack)
+
diff --git a/src/publish.sh b/src/publish.sh
index 268e6fa7b..698cfa396 100644
--- a/src/publish.sh
+++ b/src/publish.sh
@@ -34,6 +34,7 @@ cd ${OLDDIR}
 
 publish "libprojectM"
 
+publish "../fonts"
 publish "../presets"
 publish "../presets_milkdrop_104"
 publish "../presets_milkdrop_200"
@@ -46,7 +47,7 @@ publish "projectM-libvisual"
 publish "projectM-libvisual-alsa"
 publish "projectM-pulseaudio"
 publish "projectM-jack"
-publish "."
+publish ".."
 
 
 echo "[publisher] complete."