diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 148884c..01e91ae 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -206,9 +206,9 @@ if ( BUILD_SUPERKARAMBA )
   check_include_file( "sys/types.h" HAVE_SYS_TYPES_H )
 
   find_package( PythonLibs )
-  if( NOT PYTHONLIBS_FOUND )
-    tde_message_fatal( "python is required, but was not found on your system" )
-  endif( NOT PYTHONLIBS_FOUND )
+  if( NOT PYTHONLIBS_FOUND OR "${PYTHONLIBS_VERSION_STRING}" LESS "3" )
+    tde_message_fatal( "Python3 is required, but was not found on your system" )
+  endif( )
 
   if( WITH_TDENEWSTUFF )
     set( HAVE_TDENEWSTUFF 1 )
diff --git a/superkaramba/CMakeLists.txt b/superkaramba/CMakeLists.txt
index 21dbc7e..7aaf596 100644
--- a/superkaramba/CMakeLists.txt
+++ b/superkaramba/CMakeLists.txt
@@ -10,6 +10,7 @@
 #################################################
 
 add_subdirectory( src )
+add_subdirectory( examples )
 add_subdirectory( icons )
 add_subdirectory( mimetypes )
 
diff --git a/superkaramba/examples/CMakeLists.txt b/superkaramba/examples/CMakeLists.txt
new file mode 100644
index 0000000..0eefb51
--- /dev/null
+++ b/superkaramba/examples/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_subdirectory( globalMouse )
+
+install(
+  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
+  DESTINATION ${DATA_INSTALL_DIR}/superkaramba/examples
+  PATTERN CMakeLists.txt EXCLUDE
+)
diff --git a/superkaramba/examples/taskBar/cleanbar/README b/superkaramba/examples/cleanbar/README
similarity index 100%
rename from superkaramba/examples/taskBar/cleanbar/README
rename to superkaramba/examples/cleanbar/README
diff --git a/superkaramba/examples/taskBar/cleanbar/cleanbar.py b/superkaramba/examples/cleanbar/cleanbar.py
similarity index 100%
rename from superkaramba/examples/taskBar/cleanbar/cleanbar.py
rename to superkaramba/examples/cleanbar/cleanbar.py
diff --git a/superkaramba/examples/taskBar/cleanbar/cleanbar.theme b/superkaramba/examples/cleanbar/cleanbar.theme
similarity index 100%
rename from superkaramba/examples/taskBar/cleanbar/cleanbar.theme
rename to superkaramba/examples/cleanbar/cleanbar.theme
diff --git a/superkaramba/examples/taskBar/cleanbar/pics/bar2.png b/superkaramba/examples/cleanbar/pics/bar2.png
similarity index 100%
rename from superkaramba/examples/taskBar/cleanbar/pics/bar2.png
rename to superkaramba/examples/cleanbar/pics/bar2.png
diff --git a/superkaramba/examples/taskBar/cleanbar/pics/rightend.png b/superkaramba/examples/cleanbar/pics/rightend.png
similarity index 100%
rename from superkaramba/examples/taskBar/cleanbar/pics/rightend.png
rename to superkaramba/examples/cleanbar/pics/rightend.png
diff --git a/superkaramba/examples/taskBar/cleanbar/pics/rightend_new.png b/superkaramba/examples/cleanbar/pics/rightend_new.png
similarity index 100%
rename from superkaramba/examples/taskBar/cleanbar/pics/rightend_new.png
rename to superkaramba/examples/cleanbar/pics/rightend_new.png
diff --git a/superkaramba/examples/taskBar/cleanbar/pics/slickbar.png b/superkaramba/examples/cleanbar/pics/slickbar.png
similarity index 100%
rename from superkaramba/examples/taskBar/cleanbar/pics/slickbar.png
rename to superkaramba/examples/cleanbar/pics/slickbar.png
diff --git a/superkaramba/examples/taskBar/cleanbar/pics/startup.png b/superkaramba/examples/cleanbar/pics/startup.png
similarity index 100%
rename from superkaramba/examples/taskBar/cleanbar/pics/startup.png
rename to superkaramba/examples/cleanbar/pics/startup.png
diff --git a/superkaramba/examples/taskBar/cleanbar/pics/task.png b/superkaramba/examples/cleanbar/pics/task.png
similarity index 100%
rename from superkaramba/examples/taskBar/cleanbar/pics/task.png
rename to superkaramba/examples/cleanbar/pics/task.png
diff --git a/superkaramba/examples/taskBar/cleanbar/pics/task_new.png b/superkaramba/examples/cleanbar/pics/task_new.png
similarity index 100%
rename from superkaramba/examples/taskBar/cleanbar/pics/task_new.png
rename to superkaramba/examples/cleanbar/pics/task_new.png
diff --git a/superkaramba/examples/globalMouse/CMakeLists.txt b/superkaramba/examples/globalMouse/CMakeLists.txt
new file mode 100644
index 0000000..9df1a76
--- /dev/null
+++ b/superkaramba/examples/globalMouse/CMakeLists.txt
@@ -0,0 +1,11 @@
+##### xcursor.so #######################
+
+include_directories(
+  ${PYTHON_INCLUDE_DIR}
+)
+
+tde_add_library( xcursor MODULE NO_LIBTOOL_FILE
+  SOURCES extension/xcursor.c
+  LINK ${PYTHON_LIBRARIES} X11
+  DESTINATION ${DATA_INSTALL_DIR}/superkaramba/examples/globalMouse
+)
diff --git a/superkaramba/examples/globalMouse/README b/superkaramba/examples/globalMouse/README
index 758ce4b..7d2abc3 100644
--- a/superkaramba/examples/globalMouse/README
+++ b/superkaramba/examples/globalMouse/README
@@ -19,7 +19,7 @@ INSTALLATION:
 	named build. This file needs to be copied in the same directory as the
 	eyes.theme and eyes.py file.
 
-	A precompiled xcursor.so file is included (Compiled on Mandrake 9.1).
+	A precompiled xcursor.so file is included.
 
 CHANGES:
 	* Moving the theme now works as it should.
diff --git a/superkaramba/examples/globalMouse/extension/setup.py b/superkaramba/examples/globalMouse/extension/setup.py
index 49bd87b..2003334 100644
--- a/superkaramba/examples/globalMouse/extension/setup.py
+++ b/superkaramba/examples/globalMouse/extension/setup.py
@@ -5,10 +5,10 @@ def main():
 		  version = '1.0',
 		  description = 'Determines the position of the X mouse cursor',
 		  ext_modules = [Extension('xcursor', 
-		        include_dirs = ['/usr/X11R6/include'],
-		        libraries = ['X11'],
-		        library_dirs = ['/usr/X11R6/lib'],
-		        sources = ['xcursor.c'])])
+		  include_dirs = ['/usr/X11R6/include'],
+		  libraries = ['X11'],
+		  library_dirs = ['/usr/X11R6/lib'],
+		  sources = ['xcursor.c'])])
 
 if __name__ == "__main__":
     main()
diff --git a/superkaramba/examples/globalMouse/xcursor.so b/superkaramba/examples/globalMouse/xcursor.so
deleted file mode 100755
index 167bb29..0000000
Binary files a/superkaramba/examples/globalMouse/xcursor.so and /dev/null differ
diff --git a/superkaramba/examples/mouseDrag/karmix/images/bar.png b/superkaramba/examples/mouseDrag/images/bar.png
similarity index 100%
rename from superkaramba/examples/mouseDrag/karmix/images/bar.png
rename to superkaramba/examples/mouseDrag/images/bar.png
diff --git a/superkaramba/examples/mouseDrag/karmix/images/bg.png b/superkaramba/examples/mouseDrag/images/bg.png
similarity index 100%
rename from superkaramba/examples/mouseDrag/karmix/images/bg.png
rename to superkaramba/examples/mouseDrag/images/bg.png
diff --git a/superkaramba/examples/mouseDrag/karmix/karmix.py b/superkaramba/examples/mouseDrag/karmix.py
similarity index 100%
rename from superkaramba/examples/mouseDrag/karmix/karmix.py
rename to superkaramba/examples/mouseDrag/karmix.py
diff --git a/superkaramba/examples/mouseDrag/karmix/karmix.theme b/superkaramba/examples/mouseDrag/karmix.theme
similarity index 100%
rename from superkaramba/examples/mouseDrag/karmix/karmix.theme
rename to superkaramba/examples/mouseDrag/karmix.theme
diff --git a/superkaramba/examples/test_all.sh b/superkaramba/examples/test_all.sh
index 5e95063..4b920b6 100755
--- a/superkaramba/examples/test_all.sh
+++ b/superkaramba/examples/test_all.sh
@@ -1,27 +1,36 @@
 #!/bin/sh
-themes=(
-	"text/text.theme"
-	"autoHide/main.theme" 
-	"bar/bar.theme"
-	"graph/graph.theme"
-	"image/image.theme"
-	"popupMenu/popupMenu.theme"
-	"taskBar/cleanbar/cleanbar.theme"
-	"richtext/richtext.theme"
-	"richtext/rtext.theme"
-	"globalMouse/eyes.theme"
-	"unicode/unicode.theme"
-        "mouseDrag/karmix/karmix.theme"
-        "input_api/input_api.theme"
-        "input_example/input_example.theme"
-)
+themes="
+  autoHide/main.theme
+  bar/bar.theme
+  change_interval/interval.theme
+  cleanbar/cleanbar.theme
+  control_management/mgmt.theme
+  disableRightClickMenu/disable_menu.theme
+  globalMouse/eyes.theme
+  graph/graph.theme
+  image/image.theme
+  input_api/input_api.theme
+  input_example/input_example.theme
+  mouseDrag/karmix.theme
+  mouseDrop/mousedrop.theme
+  openCloseTheme/1.theme
+  openCloseTheme/2.theme
+  popupMenu/popupMenu.theme
+  richtext/richtext.theme
+  richtext/rtext.theme
+  service_group/service_group.theme
+  setIncomingData/1.theme
+  setIncomingData/2.theme
+  text/text.theme
+  unicode/unicode.theme
+"
 
-for theme in "${themes[@]}"
+for theme in $themes
 do
-	echo $theme
-	dcop `dcop superkaramba* | head -n 1` default openTheme $PWD/$theme
-	read a
-	dcop `dcop superkaramba* | head -n 1` default closeTheme `expr $theme : '.*/\(.*\)\.'`
+  echo $theme
+  dcop `dcop superkaramba* | head -n 1` default openTheme $PWD/$theme
+  read a
+  dcop `dcop superkaramba* | head -n 1` default closeTheme `expr $theme : '.*/\(.*\)\.'`
 done
 
 #dcop `dcop superkaramba* | head -n 1` default quit