diff --git a/plugins/plasmoids/CMakeLists.txt b/plugins/plasmoids/CMakeLists.txt
index abb1167..0e9fde2 100644
--- a/plugins/plasmoids/CMakeLists.txt
+++ b/plugins/plasmoids/CMakeLists.txt
@@ -1,44 +1,44 @@
-SET(libkbfxplasmadataplasmoidsrc
-    kbfxplasmadatapluginplosmoid.cpp
-   )
-
-FILE(GLOB HEADERS *.h)
-
-IF (NOT USE_KDE4)
-	KDE3_AUTOMOC(${libkbfxplasmadataplasmoidsrc})
-
-	ADD_LIBRARY(kbfxplasmadataplasmoid SHARED ${libkbfxplasmadataplasmoidsrc} )
-	SET_TARGET_PROPERTIES(kbfxplasmadataplasmoid
-		PROPERTIES
-		COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
-	# SET_TARGET_PROPERTIES(kbfxplasmadataplasmoid PROPERTIES
-	#     SOVERSION ${LIB_MAJOR}
-	#     VERSION ${APPLICATION_VERSION})
-	TARGET_LINK_LIBRARIES(kbfxplasmadataplasmoid
-	    kbfxdata
-	    ${QT_AND_KDECORE_LIBS}
-	    ${KDE3_KIO_LIBRARY}
-	    ${KDE3_UI_LIBRARY}
-	    ${KDE3_KHTML_LIBRARY}
-	    ${M_LIBRARY}
-	    )
-
-	KDE3_INSTALL_LIBTOOL_FILE(kbfxplasmadataplasmoid ${LIB_INSTALL_DIR}/kbfx/plugins)
-ELSE (NOT USE_KDE4)
-	KDE4_AUTOMOC(${libkbfxplasmadataplasmoidsrc})
-
-	KDE4_ADD_LIBRARY(kbfxplasmadataplasmoid SHARED ${libkbfxplasmadataplasmoidsrc} )
-	TARGET_LINK_LIBRARIES(kbfxplasmadataplasmoid
-	    kbfxdata
-	    ${KDE4_KDECORE_LIBS}
-	    ${KDE4_KIO_LIBS}
-	    ${KDE4_KDEUI_LIBS}
-	    ${KDE4_KHTML_LIBS}
-	    ${M_LIBRARY}
-	    )
-
-	KDE4_INSTALL_LIBTOOL_FILE(kbfxplasmadataplasmoid ${LIB_INSTALL_DIR}/kbfx/plugins)
-ENDIF (NOT USE_KDE4)
-
-INSTALL(TARGETS kbfxplasmadataplasmoid DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins)
+#################################################
+#
+#  (C) 2011 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### kbfxplasmadataplasmoid ####################
+
+set( target kbfxplasmadataplasmoid )
+
+set( ${target}_SRCS
+  kbfxplasmadatapluginplosmoid.cpp
+)
+
+tde_add_library( ${target} SHARED AUTOMOC
+  SOURCES ${${target}_SRCS}
+#   VERSION 4.2.0
+  LINK DCOP-shared kdecore-shared kdeui-shared kio-shared khtml-shared ${M_LIBRARY} kbfxdata
+  DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
+)
+
+
+##### headers #######################################
+
+file( GLOB HEADERS *.h )
 INSTALL(FILES ${HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kbfx/plugins)
diff --git a/plugins/recentstuff/CMakeLists.txt b/plugins/recentstuff/CMakeLists.txt
index 787fbd8..2b05353 100644
--- a/plugins/recentstuff/CMakeLists.txt
+++ b/plugins/recentstuff/CMakeLists.txt
@@ -1,44 +1,44 @@
-SET(libkbfxplasmarecentstuffsrc
-    kbfxplasmarecentstuff.cpp
-   )
-
-FILE(GLOB HEADERS *.h)
-
-IF (NOT USE_KDE4)
-	KDE3_AUTOMOC(${libkbfxplasmarecentstuffsrc})
-
-	ADD_LIBRARY(kbfxplasmarecentstuff SHARED ${libkbfxplasmarecentstuffsrc} )
-	SET_TARGET_PROPERTIES(kbfxplasmarecentstuff
-		PROPERTIES
-		COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
-	# SET_TARGET_PROPERTIES(kbfxplasmarecentstuff PROPERTIES
-	#     SOVERSION ${LIB_MAJOR}
-	#     VERSION ${APPLICATION_VERSION})
-	TARGET_LINK_LIBRARIES(kbfxplasmarecentstuff
-	    kbfxdata
-	    ${QT_AND_KDECORE_LIBS}
-	    ${KDE3_KIO_LIBRARY}
-	    ${KDE3_UI_LIBRARY}
-	    ${KDE3_KHTML_LIBRARY}
-	    ${M_LIBRARY}
-	    )
-
-	KDE3_INSTALL_LIBTOOL_FILE(kbfxplasmarecentstuff ${LIB_INSTALL_DIR}/kbfx/plugins)
-ELSE (NOT USE_KDE4)
-	KDE4_AUTOMOC(${libkbfxplasmarecentstuffsrc})
-
-	KDE4_ADD_LIBRARY(kbfxplasmarecentstuff SHARED ${libkbfxplasmarecentstuffsrc} )
-	TARGET_LINK_LIBRARIES(kbfxplasmarecentstuff
-	    kbfxdata
-	    ${KDE4_KDECORE_LIBS}
-	    ${KDE4_KIO_LIBS}
-	    ${KDE4_KDEUI_LIBS}
-	    ${KDE4_KHTML_LIBS}
-	    ${M_LIBRARY}
-	    )
-
-	KDE4_INSTALL_LIBTOOL_FILE(kbfxplasmarecentstuff ${LIB_INSTALL_DIR}/kbfx/plugins)
-ENDIF (NOT USE_KDE4)
-
-INSTALL(TARGETS kbfxplasmarecentstuff DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins)
-INSTALL(FILES ${HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kbfx/plugins)
+#################################################
+#
+#  (C) 2011 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### kbfxplasmarecentstuff #####################
+
+set( target kbfxplasmarecentstuff )
+
+set( ${target}_SRCS
+  kbfxplasmarecentstuff.cpp
+)
+
+tde_add_library( ${target} SHARED AUTOMOC
+  SOURCES ${${target}_SRCS}
+#   VERSION 4.2.0
+  LINK DCOP-shared kdecore-shared kdeui-shared kio-shared khtml-shared ${M_LIBRARY} kbfxdata
+  DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
+)
+
+
+##### headers #######################################
+
+file( GLOB HEADERS *.h )
+INSTALL(FILES ${HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kbfx/plugins)
\ No newline at end of file
diff --git a/plugins/settings/CMakeLists.txt b/plugins/settings/CMakeLists.txt
index 2ef6f02..b3d8045 100644
--- a/plugins/settings/CMakeLists.txt
+++ b/plugins/settings/CMakeLists.txt
@@ -1,44 +1,44 @@
-SET(libkbfxplasmadatasettingssrc
-    kbfxplasmadatapluginsettings.cpp
-   )
-
-FILE(GLOB HEADERS *.h)
-
-IF (NOT USE_KDE4)
-	KDE3_AUTOMOC(${libkbfxplasmadatasettingssrc})
-
-	ADD_LIBRARY(kbfxplasmadatasettings SHARED ${libkbfxplasmadatasettingssrc})
-	SET_TARGET_PROPERTIES(kbfxplasmadatasettings
-		PROPERTIES
-		COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
-	# SET_TARGET_PROPERTIES(kbfxplasmadatasettings PROPERTIES
-	#     SOVERSION ${LIB_MAJOR}
-	#     VERSION ${APPLICATION_VERSION})
-	TARGET_LINK_LIBRARIES(kbfxplasmadatasettings
-	    kbfxdata
-	    ${QT_AND_KDECORE_LIBS}
-	    ${KDE3_KIO_LIBRARY}
-	    ${KDE3_UI_LIBRARY}
-	    ${KDE3_KHTML_LIBRARY}
-	    ${M_LIBRARY}
-	    )
-
-	KDE3_INSTALL_LIBTOOL_FILE(kbfxplasmadatasettings ${LIB_INSTALL_DIR}/kbfx/plugins)
-ELSE (NOT USE_KDE4)
-	KDE4_AUTOMOC(${libkbfxplasmadatasettingssrc})
-
-	KDE4_ADD_LIBRARY(kbfxplasmadatasettings SHARED ${libkbfxplasmadatasettingssrc})
-	TARGET_LINK_LIBRARIES(kbfxplasmadatasettings
-	    kbfxdata
-	    ${KDE4_KDECORE_LIBS}
-	    ${KDE4_KIO_LIBS}
-	    ${KDE4_KDEUI_LIBS}
-	    ${KDE4_KHTML_LIBS}
-	    ${M_LIBRARY}
-	    )
-
-	KDE4_INSTALL_LIBTOOL_FILE(kbfxplasmadatasettings ${LIB_INSTALL_DIR}/kbfx/plugins)
-ENDIF (NOT USE_KDE4)
-
-INSTALL(TARGETS kbfxplasmadatasettings DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins)
-INSTALL(FILES ${HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kbfx/plugins)
+#################################################
+#
+#  (C) 2011 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### kbfxplasmadatasettings ####################
+
+set( target kbfxplasmadatasettings )
+
+set( ${target}_SRCS
+  kbfxplasmadatasettings.cpp
+)
+
+tde_add_library( ${target} SHARED AUTOMOC
+  SOURCES ${${target}_SRCS}
+#   VERSION 4.2.0
+  LINK DCOP-shared kdecore-shared kdeui-shared kio-shared khtml-shared ${M_LIBRARY} kbfxdata
+  DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
+)
+
+
+##### headers #######################################
+
+file( GLOB HEADERS *.h )
+INSTALL(FILES ${HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kbfx/plugins)
\ No newline at end of file
diff --git a/plugins/strigi/CMakeLists.txt b/plugins/strigi/CMakeLists.txt
index 29289b0..9d9e1f3 100644
--- a/plugins/strigi/CMakeLists.txt
+++ b/plugins/strigi/CMakeLists.txt
@@ -1,46 +1,44 @@
-SET(libkbfxstrigiclientsrc
-    kbfxstrigiplugin.cpp
-   )
-
-FILE(GLOB HEADERS *.h)
-
-IF (NOT USE_KDE4)
-	KDE3_AUTOMOC(${libkbfxstrigiclientsrc})
-
-	ADD_LIBRARY(kbfxstrigiclient SHARED ${libkbfxstrigiclientsrc})
-	SET_TARGET_PROPERTIES(kbfxstrigiclient
-		PROPERTIES
-		COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
-	# SET_TARGET_PROPERTIES(kbfxstrigiclient PROPERTIES
-	#     SOVERSION ${LIB_MAJOR}
-	#     VERSION ${APPLICATION_VERSION})
-	TARGET_LINK_LIBRARIES(kbfxstrigiclient
-	    kbfxdata
-	    ${QT_AND_KDECORE_LIBS}
-	    ${KDE3_KIO_LIBRARY}
-	    ${KDE3_UI_LIBRARY}
-	    ${KDE3_KHTML_LIBRARY}
-	    ${M_LIBRARY}
-	    ${STRIGICLIENT_LIBRARY}
-	    )
-
-	KDE3_INSTALL_LIBTOOL_FILE(kbfxstrigiclient ${LIB_INSTALL_DIR}/kbfx/plugins)
-ELSE (NOT USE_KDE4)
-	KDE4_AUTOMOC(${libkbfxstrigiclientsrc})
-
-	KDE4_ADD_LIBRARY(kbfxstrigiclient SHARED ${libkbfxstrigiclientsrc})
-	TARGET_LINK_LIBRARIES(kbfxstrigiclient
-	    kbfxdata
-	    ${KDE4_KDECORE_LIBS}
-	    ${KDE4_KIO_LIBS}
-	    ${KDE4_KDEUI_LIBS}
-	    ${KDE4_KHTML_LIBS}
-	    ${M_LIBRARY}
-	    ${STRIGICLIENT_LIBRARY}
-	    )
-
-	KDE4_INSTALL_LIBTOOL_FILE(kbfxstrigiclient ${LIB_INSTALL_DIR}/kbfx/plugins)
-ENDIF (NOT USE_KDE4)
-
-INSTALL(TARGETS kbfxstrigiclient DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins)
-INSTALL(FILES ${HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kbfx/plugins)
+#################################################
+#
+#  (C) 2011 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### kbfxstrigiclient ##########################
+
+set( target kbfxstrigiclient )
+
+set( ${target}_SRCS
+  kbfxstrigiplugin.cpp
+)
+
+tde_add_library( ${target} SHARED AUTOMOC
+  SOURCES ${${target}_SRCS}
+#   VERSION 4.2.0
+  LINK DCOP-shared kdecore-shared kdeui-shared kio-shared khtml-shared ${M_LIBRARY} ${STRIGICLIENT_LIBRARY} kbfxdata kbfxplasmadatasettings
+  DESTINATION ${LIB_INSTALL_DIR}/kbfx/plugins
+)
+
+
+##### headers #######################################
+
+file( GLOB HEADERS *.h )
+INSTALL(FILES ${HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kbfx/plugins)
\ No newline at end of file