diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39bd1338..cd53c1dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,103 +1,103 @@
 project(oxygen)
 set(PROJECT_VERSION "5.16.80")
 set(PROJECT_VERSION_MAJOR 5)
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 
 include(GenerateExportHeader)
 include(WriteBasicConfigVersionFile)
 include(FeatureSummary)
 
 set(OXYGEN_USE_KDE4 ${USE_KDE4})
 if(OXYGEN_USE_KDE4)
 
   ############ Language and toolchain features
   ############ copied from ECM
   if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
   elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" AND NOT WIN32)
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
   endif()
 
 endif()
 
 ################# Qt/KDE #################
 if(OXYGEN_USE_KDE4)
 
   find_package(KDE4 REQUIRED)
   include(KDE4Defaults)
   include(MacroLibrary)
 
   add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
   include_directories(${KDE4_INCLUDES})
 
   ### XCB
   find_package(PkgConfig)
   pkg_check_modules(XCB xcb x11-xcb)
   add_feature_info("x11-xcb" XCB_FOUND "Required to pass style properties to native Windows on X11 Platform")
   set_feature_info("x11-xcb" "Required to pass style properties to native Windows on X11 Platform" "http://xcb.freedesktop.org")
   set(OXYGEN_HAVE_X11 ${XCB_FOUND})
   set(OXYGEN_HAVE_KWAYLAND FALSE)
 
   add_subdirectory(liboxygen)
   add_subdirectory(kstyle)
 
 else()
 
   find_package(ECM 0.0.9 REQUIRED NO_MODULE)
   set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
   find_package(Qt5 REQUIRED CONFIG COMPONENTS Widgets DBus Quick)
   find_package(KF5 REQUIRED COMPONENTS
       I18n
       Config
       GuiAddons
       WidgetsAddons
       Service
       Completion
       FrameworkIntegration
       WindowSystem)
 
   find_package(XCB COMPONENTS XCB)
   set_package_properties(XCB PROPERTIES
       DESCRIPTION "X protocol C-language Binding"
       URL "http://xcb.freedesktop.org"
       TYPE OPTIONAL
       PURPOSE "Required to pass style properties to native Windows on X11 Platform"
   )
 
   find_package(KF5Wayland CONFIG)
   set(OXYGEN_HAVE_KWAYLAND ${KF5Wayland_FOUND})
 
   if(NOT APPLE)
 
     set(OXYGEN_HAVE_X11 ${XCB_XCB_FOUND})
     if (XCB_XCB_FOUND)
       find_package(Qt5 REQUIRED CONFIG COMPONENTS X11Extras)
     endif()
 
   endif()
 
   include(ECMInstallIcons)
   include(KDEInstallDirs)
   include(KDECMakeSettings)
   include(KDECompilerSettings NO_POLICY_SCOPE)
 
   add_subdirectory(liboxygen)
   add_subdirectory(kstyle)
+  add_subdirectory(color-schemes)  
   add_subdirectory(cursors)
-
   add_subdirectory(sounds)
   add_subdirectory(kdecoration)
 
   install(DIRECTORY lookandfeel/ DESTINATION ${KDE_INSTALL_DATADIR}/plasma/look-and-feel/org.kde.oxygen
           PATTERN "Messages.sh" EXCLUDE PATTERN "CMakeLists.txt" EXCLUDE)
 
   # po/ dir added by packaging scripts
   if(EXISTS ${CMAKE_SOURCE_DIR}/po AND IS_DIRECTORY ${CMAKE_SOURCE_DIR}/po)
     find_package(KF5I18n CONFIG REQUIRED)
     ki18n_install(po)
   endif()
 
 endif()
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/color-schemes/CMakeLists.txt b/color-schemes/CMakeLists.txt
new file mode 100644
index 00000000..02fde70b
--- /dev/null
+++ b/color-schemes/CMakeLists.txt
@@ -0,0 +1,3 @@
+file(GLOB schemefiles *.colors)
+install( FILES ${schemefiles} DESTINATION 
+${KDE_INSTALL_DATADIR}/color-schemes )
diff --git a/color-schemes/ExtraDesktop.sh b/color-schemes/ExtraDesktop.sh
new file mode 100644
index 00000000..406e6f36
--- /dev/null
+++ b/color-schemes/ExtraDesktop.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+find -name \*.colors -print
diff --git a/color-schemes/Oxygen.colors b/color-schemes/Oxygen.colors
new file mode 100644
index 00000000..d1e69ef1
--- /dev/null
+++ b/color-schemes/Oxygen.colors
@@ -0,0 +1,143 @@
+[ColorEffects:Disabled]
+Color=56,56,56
+ColorAmount=0
+ColorEffect=0
+ContrastAmount=0.65
+ContrastEffect=1
+IntensityAmount=0.1
+IntensityEffect=2
+
+[ColorEffects:Inactive]
+ChangeSelectionColor=true
+Color=112,111,110
+ColorAmount=-0.9
+ColorEffect=1
+ContrastAmount=0.25
+ContrastEffect=2
+Enable=true
+IntensityAmount=0
+IntensityEffect=0
+
+[Colors:Button]
+BackgroundAlternate=224,223,222
+BackgroundNormal=223,220,217
+DecorationFocus=58,167,221
+DecorationHover=110,214,255
+ForegroundActive=146,76,157
+ForegroundInactive=137,136,135
+ForegroundLink=0,87,174
+ForegroundNegative=191,3,3
+ForegroundNeutral=176,128,0
+ForegroundNormal=34,31,30
+ForegroundPositive=0,110,40
+ForegroundVisited=100,74,155
+
+[Colors:Selection]
+BackgroundAlternate=62,138,204
+BackgroundNormal=67,172,232
+DecorationFocus=58,167,221
+DecorationHover=110,214,255
+ForegroundActive=108,36,119
+ForegroundInactive=199,226,248
+ForegroundLink=0,49,110
+ForegroundNegative=156,14,14
+ForegroundNeutral=255,221,0
+ForegroundNormal=255,255,255
+ForegroundPositive=128,255,128
+ForegroundVisited=69,40,134
+
+[Colors:Tooltip]
+BackgroundAlternate=196,224,255
+BackgroundNormal=24,21,19
+DecorationFocus=58,167,221
+DecorationHover=110,214,255
+ForegroundActive=255,128,224
+ForegroundInactive=137,136,135
+ForegroundLink=88,172,255
+ForegroundNegative=191,3,3
+ForegroundNeutral=176,128,0
+ForegroundNormal=231,253,255
+ForegroundPositive=0,110,40
+ForegroundVisited=150,111,232
+
+[Colors:View]
+BackgroundAlternate=248,247,246
+BackgroundNormal=255,255,255
+DecorationFocus=58,167,221
+DecorationHover=110,214,255
+ForegroundActive=146,76,157
+ForegroundInactive=137,136,135
+ForegroundLink=0,87,174
+ForegroundNegative=191,3,3
+ForegroundNeutral=176,128,0
+ForegroundNormal=31,28,27
+ForegroundPositive=0,110,40
+ForegroundVisited=100,74,155
+
+[Colors:Window]
+BackgroundAlternate=218,217,216
+BackgroundNormal=214,210,208
+DecorationFocus=58,167,221
+DecorationHover=110,214,255
+ForegroundActive=146,76,157
+ForegroundInactive=137,136,135
+ForegroundLink=0,87,174
+ForegroundNegative=191,3,3
+ForegroundNeutral=176,128,0
+ForegroundNormal=34,31,30
+ForegroundPositive=0,110,40
+ForegroundVisited=100,74,155
+
+[Colors:Complementary]
+BackgroundAlternate=196,224,255
+BackgroundNormal=24,21,19
+DecorationFocus=58,167,221
+DecorationHover=110,214,255
+ForegroundActive=255,128,224
+ForegroundInactive=137,136,135
+ForegroundLink=88,172,255
+ForegroundNegative=191,3,3
+ForegroundNeutral=176,128,0
+ForegroundNormal=231,253,255
+ForegroundPositive=0,110,40
+ForegroundVisited=150,111,232
+
+[General]
+ColorScheme=Oxygen
+Name=Oxygen
+Name[ca]=Oxygen
+Name[ca@valencia]=Oxygen
+Name[cs]=Oxygen
+Name[da]=Oxygen
+Name[de]=Oxygen
+Name[en_GB]=Oxygen
+Name[es]=Oxígeno
+Name[eu]=Oxygen
+Name[fi]=Oxygen
+Name[fr]=Oxygen
+Name[gl]=Osíxeno
+Name[id]=Oxygen
+Name[it]=Oxygen
+Name[ko]=Oxygen
+Name[nl]=Oxygen
+Name[nn]=Oxygen
+Name[pl]=Tlen
+Name[pt]=Oxygen
+Name[pt_BR]=Oxygen
+Name[ru]=Oxygen
+Name[sk]=Kyslík
+Name[sv]=Syre
+Name[uk]=Oxygen
+Name[x-test]=xxOxygenxx
+Name[zh_CN]=氧气
+Name[zh_TW]=Oxygen
+shadeSortColumn=true
+
+[KDE]
+contrast=7
+
+[WM]
+activeBackground=48,174,232
+activeForeground=255,255,255
+inactiveBackground=224,223,222
+inactiveForeground=75,71,67
diff --git a/color-schemes/OxygenCold.colors b/color-schemes/OxygenCold.colors
new file mode 100644
index 00000000..257a4d10
--- /dev/null
+++ b/color-schemes/OxygenCold.colors
@@ -0,0 +1,134 @@
+[ColorEffects:Disabled]
+ColorAmount=0
+ColorEffect=0
+ContrastAmount=0.65
+ContrastEffect=1
+IntensityAmount=0.1
+IntensityEffect=2
+
+[ColorEffects:Inactive]
+Color=112,111,110
+ColorAmount=0.025
+ColorEffect=2
+ContrastAmount=0.1
+ContrastEffect=2
+IntensityAmount=0
+IntensityEffect=0
+
+[Colors:Button]
+BackgroundAlternate=224,223,222
+BackgroundNormal=232,231,230
+DecorationFocus=43,116,199
+DecorationHover=119,183,255
+ForegroundActive=255,128,224
+ForegroundInactive=136,135,134
+ForegroundLink=0,87,174
+ForegroundNegative=191,3,3
+ForegroundNeutral=176,128,0
+ForegroundNormal=20,19,18
+ForegroundPositive=0,110,40
+ForegroundVisited=69,40,134
+
+[Colors:Selection]
+BackgroundAlternate=62,138,204
+BackgroundNormal=65,139,212
+DecorationFocus=43,116,199
+DecorationHover=119,183,255
+ForegroundActive=255,128,224
+ForegroundInactive=165,193,228
+ForegroundLink=0,49,110
+ForegroundNegative=156,14,14
+ForegroundNeutral=255,221,0
+ForegroundNormal=255,255,255
+ForegroundPositive=128,255,128
+ForegroundVisited=69,40,134
+
+[Colors:Tooltip]
+BackgroundAlternate=196,224,255
+BackgroundNormal=192,218,255
+DecorationFocus=43,116,199
+DecorationHover=119,183,255
+ForegroundActive=255,128,224
+ForegroundInactive=96,112,128
+ForegroundLink=0,87,174
+ForegroundNegative=191,3,3
+ForegroundNeutral=176,128,0
+ForegroundNormal=20,19,18
+ForegroundPositive=0,110,40
+ForegroundVisited=69,40,134
+
+[Colors:View]
+BackgroundAlternate=248,247,246
+BackgroundNormal=255,255,255
+DecorationFocus=43,116,199
+DecorationHover=119,183,255
+ForegroundActive=255,128,224
+ForegroundInactive=136,135,134
+ForegroundLink=0,87,174
+ForegroundNegative=191,3,3
+ForegroundNeutral=176,128,0
+ForegroundNormal=20,19,18
+ForegroundPositive=0,110,40
+ForegroundVisited=69,40,134
+
+[Colors:Window]
+BackgroundAlternate=218,217,216
+BackgroundNormal=224,223,222
+DecorationFocus=43,116,199
+DecorationHover=119,183,255
+ForegroundActive=255,128,224
+ForegroundInactive=136,135,134
+ForegroundLink=0,87,174
+ForegroundNegative=191,3,3
+ForegroundNeutral=176,128,0
+ForegroundNormal=20,19,18
+ForegroundPositive=0,110,40
+ForegroundVisited=69,40,134
+
+[Colors:Complementary]
+BackgroundAlternate=196,224,255
+BackgroundNormal=24,21,19
+DecorationFocus=58,167,221
+DecorationHover=110,214,255
+ForegroundActive=255,128,224
+ForegroundInactive=137,136,135
+ForegroundLink=88,172,255
+ForegroundNegative=191,3,3
+ForegroundNeutral=176,128,0
+ForegroundNormal=231,253,255
+ForegroundPositive=0,110,40
+ForegroundVisited=150,111,232
+
+[General]
+Name=Oxygen Cold
+Name[ca]=Oxygen Cold
+Name[ca@valencia]=Oxygen Cold
+Name[da]=Oxygen Cold
+Name[de]=Oxygen-Kalt
+Name[en_GB]=Oxygen Cold
+Name[es]=Oxígeno frío
+Name[eu]=Oxygen Hotza
+Name[fi]=Oxygen Cold
+Name[fr]=Oxygen Cold
+Name[gl]=Osíxeno frío
+Name[id]=Oxygen Cold
+Name[it]=Oxygen freddo
+Name[ko]=차가운 Oxygen
+Name[nl]=Oxygen Cold
+Name[nn]=Oxygen kald
+Name[pl]=Zimny tlen
+Name[pt]=Oxygen Frio
+Name[pt_BR]=Oxygen Frio
+Name[ru]=Oxygen (холодная)
+Name[sk]=Studený kyslík
+Name[sv]=Kallt syre
+Name[uk]=Холодна Oxygen
+Name[x-test]=xxOxygen Coldxx
+Name[zh_CN]=氧气冷色
+Name[zh_TW]=Oxygen Cold
+
+[WM]
+activeBackground=96,148,207
+activeForeground=255,255,255
+inactiveBackground=224,223,222
+inactiveForeground=20,19,18