diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5f41228a0..1ffc1c53df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,8 @@
 ########### configure tests ###############
 INCLUDE(CMakeDependentOption)
 
-OPTION(KWIN_BUILD_DECORATIONS "Enable building of KWin decorations." OFF)
-OPTION(KWIN_BUILD_OXYGEN "Enable building of default decoration Oxygen" ON)
+OPTION(KWIN_BUILD_DECORATIONS "Enable building of KWin decorations." ON)
+OPTION(KWIN_BUILD_OXYGEN "Enable building of default decoration Oxygen" OFF)
 OPTION(KWIN_BUILD_KCMS "Enable building of KWin configuration modules." OFF)
 OPTION(KWIN_MOBILE_EFFECTS "Only build effects relevant for mobile devices" OFF)
 OPTION(KWIN_BUILD_TABBOX "Enable building of KWin Tabbox functionality" ON)
diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt
index 69939b0458..0593511ac5 100644
--- a/clients/CMakeLists.txt
+++ b/clients/CMakeLists.txt
@@ -2,5 +2,5 @@ add_subdirectory( aurorae )
 if(KWIN_BUILD_OXYGEN)
     add_subdirectory( oxygen )
 endif()
-add_subdirectory( b2 )
-add_subdirectory( laptop )
+# add_subdirectory( b2 )
+# add_subdirectory( laptop )