diff --git a/jovie/CMakeLists.txt b/jovie/CMakeLists.txt
index e79287cb..c8c70324 100644
--- a/jovie/CMakeLists.txt
+++ b/jovie/CMakeLists.txt
@@ -18,20 +18,25 @@ set_package_properties(Speechd PROPERTIES
     PURPOSE "Jovie requires speech dispatcher."
 )
 
-if (SPEECHD_FOUND)
+if(SPEECHD_FOUND)
     if(NOT Q_WS_X11)
         message(FATAL_ERROR "Jovie requires a X11-based system.")
     endif()
 
-    configure_file (config-jovie.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-jovie.h )
+    configure_file(
+        config-jovie.h.cmake
+        ${CMAKE_CURRENT_BINARY_DIR}/config-jovie.h
+    )
 
-    include_directories(${CMAKE_CURRENT_BINARY_DIR}/libkttsd ${CMAKE_CURRENT_SOURCE_DIR}/libkttsd)
+    include_directories(
+        ${CMAKE_CURRENT_BINARY_DIR}
+        ${CMAKE_CURRENT_BINARY_DIR}/libkttsd
+        ${CMAKE_CURRENT_SOURCE_DIR}/libkttsd
+    )
 
-    add_subdirectory( libkttsd )
-    add_subdirectory( filters )
-    add_subdirectory( jovie )
-    add_subdirectory( kcmkttsmgr )
-    add_subdirectory( icons )
-endif (SPEECHD_FOUND)
-
-# macro_display_feature_log()
+    add_subdirectory(libkttsd)
+    add_subdirectory(filters)
+    add_subdirectory(jovie)
+    add_subdirectory(kcmkttsmgr)
+    add_subdirectory(icons)
+endif()
diff --git a/jovie/filters/CMakeLists.txt b/jovie/filters/CMakeLists.txt
index b3a0aa51..c2101936 100644
--- a/jovie/filters/CMakeLists.txt
+++ b/jovie/filters/CMakeLists.txt
@@ -1,23 +1,22 @@
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
-add_subdirectory( stringreplacer ) 
-add_subdirectory( xmltransformer ) 
-add_subdirectory( talkerchooser ) 
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
 
+add_subdirectory(stringreplacer) 
+add_subdirectory(xmltransformer) 
+add_subdirectory(talkerchooser) 
 
 ########### next target ###############
 
 if(ENABLE_TESTING)
     set(testfilter_SRCS main.cpp )
 
-    kde4_add_manual_test(testfilter ${testfilter_SRCS})
+    kde4_add_manual_test(testfilter main.cpp)
 
-    target_link_libraries(testfilter  ${KDE4_KDEUI_LIBS} kttsd )
+    target_link_libraries(testfilter  ${KDE4_KDEUI_LIBS} kttsd)
 endif()
 
 ########### install files ###############
 
-install( FILES jovie_filterplugin.desktop  DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
-
-
-
+install(
+    FILES jovie_filterplugin.desktop
+    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
diff --git a/jovie/filters/stringreplacer/CMakeLists.txt b/jovie/filters/stringreplacer/CMakeLists.txt
index 1c6dc455..a8c086a2 100644
--- a/jovie/filters/stringreplacer/CMakeLists.txt
+++ b/jovie/filters/stringreplacer/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-
 ########### next target ###############
 
 set(jovie_stringreplacerplugin_PART_SRCS
@@ -8,15 +6,16 @@ set(jovie_stringreplacerplugin_PART_SRCS
     stringreplacerproc.cpp
     stringreplacerplugin.cpp 
     cdataescaper.cpp
-    stringreplacerconfwidget.ui
-    editreplacementwidget.ui
 )
 
 kde4_add_plugin(jovie_stringreplacerplugin ${jovie_stringreplacerplugin_PART_SRCS})
 
-target_link_libraries(jovie_stringreplacerplugin  ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} kttsd)
+target_link_libraries(jovie_stringreplacerplugin ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} kttsd)
 
-install(TARGETS jovie_stringreplacerplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(
+    TARGETS jovie_stringreplacerplugin
+    DESTINATION ${PLUGIN_INSTALL_DIR}
+)
 
 ########### test cdata escaper ##########
 
@@ -32,7 +31,8 @@ endif()
 
 ########### install files ###############
 
-install(FILES
+install(
+    FILES
     abbreviations.xml
     chat.xml
     chat-de.xml
@@ -41,8 +41,13 @@ install(FILES
     polish_festival_unspeakables.xml
     kmail.xml
     festival_unspeakable_chars.xml
-    qt2plaintext.xml DESTINATION ${DATA_INSTALL_DIR}/jovie/stringreplacer/)
+    qt2plaintext.xml
+    DESTINATION ${DATA_INSTALL_DIR}/jovie/stringreplacer
+)
 
-install(FILES jovie_stringreplacerplugin.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+install(
+    FILES jovie_stringreplacerplugin.desktop
+    DESTINATION  ${SERVICES_INSTALL_DIR}
+)
 
 
diff --git a/jovie/filters/talkerchooser/CMakeLists.txt b/jovie/filters/talkerchooser/CMakeLists.txt
index e9d5443e..fbbe4fdc 100644
--- a/jovie/filters/talkerchooser/CMakeLists.txt
+++ b/jovie/filters/talkerchooser/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-
 ########### next target ###############
 
 set(jovie_talkerchooserplugin_PART_SRCS 
@@ -7,19 +5,25 @@ set(jovie_talkerchooserplugin_PART_SRCS
     talkerchooserconf.cpp 
     talkerchooserproc.cpp 
     talkerchooserplugin.cpp
-    talkerchooserconfwidget.ui
-    selecttalkerwidget.ui
 )
 
 kde4_add_plugin(jovie_talkerchooserplugin ${jovie_talkerchooserplugin_PART_SRCS})
 
-target_link_libraries(jovie_talkerchooserplugin  ${KDE4_KIO_LIBS} kttsd )
-
-install(TARGETS jovie_talkerchooserplugin  DESTINATION ${PLUGIN_INSTALL_DIR} )
+target_link_libraries(jovie_talkerchooserplugin ${KDE4_KIO_LIBS} kttsd)
 
+install(
+    TARGETS jovie_talkerchooserplugin
+    DESTINATION ${PLUGIN_INSTALL_DIR}
+)
 
 ########### install files ###############
 
-install( FILES female_notifications_rc  DESTINATION  ${DATA_INSTALL_DIR}/jovie/talkerchooser/ )
-install( FILES jovie_talkerchooserplugin.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+install(
+    FILES female_notifications_rc
+    DESTINATION ${DATA_INSTALL_DIR}/jovie/talkerchooser
+)
 
+install(
+    FILES jovie_talkerchooserplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/jovie/filters/xmltransformer/CMakeLists.txt b/jovie/filters/xmltransformer/CMakeLists.txt
index 980aa702..04d3a5e8 100644
--- a/jovie/filters/xmltransformer/CMakeLists.txt
+++ b/jovie/filters/xmltransformer/CMakeLists.txt
@@ -1,24 +1,30 @@
-
-
 ########### next target ###############
 
 set(jovie_xmltransformerplugin_PART_SRCS
     xmltransformerconf.cpp
     xmltransformerproc.cpp
     xmltransformerplugin.cpp
-    xmltransformerconfwidget.ui
 )
 
 kde4_add_plugin(jovie_xmltransformerplugin ${jovie_xmltransformerplugin_PART_SRCS})
 
-target_link_libraries(jovie_xmltransformerplugin  ${KDE4_KIO_LIBS} kttsd )
-
-install(TARGETS jovie_xmltransformerplugin  DESTINATION ${PLUGIN_INSTALL_DIR} )
+target_link_libraries(jovie_xmltransformerplugin ${KDE4_KIO_LIBS} kttsd)
 
+install(
+    TARGETS jovie_xmltransformerplugin
+    DESTINATION ${PLUGIN_INSTALL_DIR}
+)
 
 ########### install files ###############
 
-install( FILES xhtml2ssml.xsl xhtml2ssml_simple.xsl  DESTINATION  ${DATA_INSTALL_DIR}/jovie/xmltransformer/ )
-install( FILES jovie_xmltransformerplugin.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
-
+install(
+    FILES
+    xhtml2ssml.xsl
+    xhtml2ssml_simple.xsl
+    DESTINATION ${DATA_INSTALL_DIR}/jovie/xmltransformer
+)
 
+install(
+    FILES jovie_xmltransformerplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/jovie/icons/CMakeLists.txt b/jovie/icons/CMakeLists.txt
index 26938847..02e3c9ec 100644
--- a/jovie/icons/CMakeLists.txt
+++ b/jovie/icons/CMakeLists.txt
@@ -1,2 +1 @@
-kde4_install_icons( ${ICON_INSTALL_DIR}   )
-
+kde4_install_icons(${ICON_INSTALL_DIR})
diff --git a/jovie/jovie/CMakeLists.txt b/jovie/jovie/CMakeLists.txt
index a3187438..cb6b187b 100644
--- a/jovie/jovie/CMakeLists.txt
+++ b/jovie/jovie/CMakeLists.txt
@@ -1,22 +1,25 @@
-
-include_directories( ${SPEECHD_INCLUDE_DIR} )
+include_directories(${SPEECHD_INCLUDE_DIR})
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=2400)
 
 ########### next target ###############
 
 set(jovie_SRCS
-   main.cpp
-   jovie.cpp
-   speaker.cpp
-   appdata.cpp
-   ssmlconvert.cpp
-   filtermgr.cpp
-   talkermgr.cpp
-   jovietrayicon.cpp
+    main.cpp
+    jovie.cpp
+    speaker.cpp
+    appdata.cpp
+    ssmlconvert.cpp
+    filtermgr.cpp
+    talkermgr.cpp
+    jovietrayicon.cpp
 )
 
-qt4_add_dbus_adaptor(jovie_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml jovie.h Jovie)
+qt4_add_dbus_adaptor(jovie_SRCS
+    ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml
+    jovie.h
+    Jovie
+)
 
 add_executable(jovie_bin ${jovie_SRCS})
 
@@ -27,13 +30,27 @@ target_link_libraries(jovie_bin
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KIO_LIBS}
-    kttsd )
+    kttsd
+)
 
-install(TARGETS jovie_bin  ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS jovie_bin ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install files ###############
 
-install( FILES SSMLtoPlainText.xsl  DESTINATION  ${DATA_INSTALL_DIR}/jovie/xslt/ )
-install( FILES jovie.desktop kttsd.desktop DESTINATION  ${SERVICES_INSTALL_DIR} )
-install( PROGRAMS jovieapp.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
+install(
+    FILES SSMLtoPlainText.xsl
+    DESTINATION ${DATA_INSTALL_DIR}/jovie/xslt
+)
+
+install(
+    FILES
+    jovie.desktop
+    kttsd.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    PROGRAMS jovieapp.desktop
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
 
diff --git a/jovie/kcmkttsmgr/CMakeLists.txt b/jovie/kcmkttsmgr/CMakeLists.txt
index 9f7beb8e..028a7992 100644
--- a/jovie/kcmkttsmgr/CMakeLists.txt
+++ b/jovie/kcmkttsmgr/CMakeLists.txt
@@ -1,31 +1,38 @@
-
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=2404)
 
-
 ########### next target ###############
 
 set(kcm_kttsd_PART_SRCS 
-   kcmkttsmgr.cpp 
-   kttsjobmgr.cpp
-   addtalker.cpp
-   talkerwidget.cpp
-   kcmkttsmgrwidget.ui
-   kttsjobmgr.ui
-   talkerwidget.ui
+    kcmkttsmgr.cpp 
+    kttsjobmgr.cpp
+    addtalker.cpp
+    talkerwidget.cpp
 )
 
-qt4_add_dbus_interfaces(kcm_kttsd_PART_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml )
+qt4_add_dbus_interfaces(kcm_kttsd_PART_SRCS
+    ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml
+)
 
 kde4_add_plugin(kcm_kttsd ${kcm_kttsd_PART_SRCS})
 
-target_link_libraries(kcm_kttsd  ${KDE4_KIO_LIBS} ${SPEECHD_LIBRARIES} kttsd  )
+target_link_libraries(kcm_kttsd ${KDE4_KIO_LIBS} ${SPEECHD_LIBRARIES} kttsd)
 
-install(TARGETS kcm_kttsd  DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(
+    TARGETS kcm_kttsd
+    DESTINATION ${PLUGIN_INSTALL_DIR}
+)
 
 
 ########### install files ###############
 
-install( FILES kcmkttsd.desktop  DESTINATION ${SERVICES_INSTALL_DIR}  )
-install( FILES kcmkttsd_testmessage.desktop  DESTINATION  ${DATA_INSTALL_DIR}/jovie/ )
+install(
+    FILES kcmkttsd.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES kcmkttsd_testmessage.desktop
+    DESTINATION ${DATA_INSTALL_DIR}/jovie
+)
 
 
diff --git a/jovie/libkttsd/CMakeLists.txt b/jovie/libkttsd/CMakeLists.txt
index a261c11f..99ccad6b 100644
--- a/jovie/libkttsd/CMakeLists.txt
+++ b/jovie/libkttsd/CMakeLists.txt
@@ -1,13 +1,13 @@
-
-include_directories( ${SPEECHD_INCLUDE_DIR} )
+include_directories(${SPEECHD_INCLUDE_DIR})
 
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=2405)
 
 set(kttsd_LIB_SRCS
-   talkercode.cpp 
-   filterproc.cpp 
-   filterconf.cpp 
-   talkerlistmodel.cpp ) 
+    talkercode.cpp 
+    filterproc.cpp 
+    filterconf.cpp 
+    talkerlistmodel.cpp
+) 
 
 add_library(kttsd SHARED ${kttsd_LIB_SRCS})
 
@@ -17,13 +17,17 @@ target_link_libraries(kttsd
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KUTILS_LIBS}
     ${QT_QTXML_LIBRARY}
-    )
+)
 
-set_target_properties(kttsd PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS kttsd  ${INSTALL_TARGETS_DEFAULT_ARGS} )
+set_target_properties(kttsd PROPERTIES
+    VERSION ${GENERIC_LIB_VERSION}
+    SOVERSION ${GENERIC_LIB_SOVERSION}
+)
+
+install(TARGETS kttsd ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 
 ########### install files ###############
 
-#install( FILES kttsd_synthplugin.desktop  DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
+#install(FILES kttsd_synthplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})