diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00b7bbc2f..c171062a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,3 @@
 
-install(FILES colors metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/)
-
-FILE(GLOB widgets widgets/*.svgz)
-install( FILES ${widgets} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/ )
-
-FILE(GLOB dialogs dialogs/*.svgz)
-install( FILES ${dialogs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/dialogs/ )
-
-FILE(GLOB opaque opaque/widgets/*.svgz)
-install( FILES ${opaque} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/opaque/widgets/ )
-
-FILE(GLOB opaque opaque/dialogs/*.svgz)
-install( FILES ${opaque} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/opaque/dialogs/ )
+add_subdirectory( oxygen )
 
diff --git a/oxygen/CMakeLists.txt b/oxygen/CMakeLists.txt
new file mode 100644
index 000000000..00b7bbc2f
--- /dev/null
+++ b/oxygen/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+install(FILES colors metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/)
+
+FILE(GLOB widgets widgets/*.svgz)
+install( FILES ${widgets} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/widgets/ )
+
+FILE(GLOB dialogs dialogs/*.svgz)
+install( FILES ${dialogs} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/dialogs/ )
+
+FILE(GLOB opaque opaque/widgets/*.svgz)
+install( FILES ${opaque} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/opaque/widgets/ )
+
+FILE(GLOB opaque opaque/dialogs/*.svgz)
+install( FILES ${opaque} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/opaque/dialogs/ )
+
diff --git a/colors b/oxygen/colors
similarity index 100%
rename from colors
rename to oxygen/colors
diff --git a/dialogs/background.svgz b/oxygen/dialogs/background.svgz
similarity index 100%
rename from dialogs/background.svgz
rename to oxygen/dialogs/background.svgz
diff --git a/dialogs/kickoff.svgz b/oxygen/dialogs/kickoff.svgz
similarity index 100%
rename from dialogs/kickoff.svgz
rename to oxygen/dialogs/kickoff.svgz
diff --git a/dialogs/krunner.svgz b/oxygen/dialogs/krunner.svgz
similarity index 100%
rename from dialogs/krunner.svgz
rename to oxygen/dialogs/krunner.svgz
diff --git a/dialogs/shutdowndialog.source.svgz b/oxygen/dialogs/shutdowndialog.source.svgz
similarity index 100%
rename from dialogs/shutdowndialog.source.svgz
rename to oxygen/dialogs/shutdowndialog.source.svgz
diff --git a/dialogs/shutdowndialog.svgz b/oxygen/dialogs/shutdowndialog.svgz
similarity index 100%
rename from dialogs/shutdowndialog.svgz
rename to oxygen/dialogs/shutdowndialog.svgz
diff --git a/metadata.desktop b/oxygen/metadata.desktop
similarity index 100%
rename from metadata.desktop
rename to oxygen/metadata.desktop
diff --git a/opaque/dialogs/background.svgz b/oxygen/opaque/dialogs/background.svgz
similarity index 100%
rename from opaque/dialogs/background.svgz
rename to oxygen/opaque/dialogs/background.svgz
diff --git a/opaque/dialogs/krunner.svgz b/oxygen/opaque/dialogs/krunner.svgz
similarity index 100%
rename from opaque/dialogs/krunner.svgz
rename to oxygen/opaque/dialogs/krunner.svgz
diff --git a/opaque/dialogs/shutdowndialog.svgz b/oxygen/opaque/dialogs/shutdowndialog.svgz
similarity index 100%
rename from opaque/dialogs/shutdowndialog.svgz
rename to oxygen/opaque/dialogs/shutdowndialog.svgz
diff --git a/opaque/widgets/extender-background.svgz b/oxygen/opaque/widgets/extender-background.svgz
similarity index 100%
rename from opaque/widgets/extender-background.svgz
rename to oxygen/opaque/widgets/extender-background.svgz
diff --git a/opaque/widgets/panel-background.svgz b/oxygen/opaque/widgets/panel-background.svgz
similarity index 100%
rename from opaque/widgets/panel-background.svgz
rename to oxygen/opaque/widgets/panel-background.svgz
diff --git a/opaque/widgets/tooltip.svgz b/oxygen/opaque/widgets/tooltip.svgz
similarity index 100%
rename from opaque/widgets/tooltip.svgz
rename to oxygen/opaque/widgets/tooltip.svgz
diff --git a/widgets/analog_meter.svgz b/oxygen/widgets/analog_meter.svgz
similarity index 100%
rename from widgets/analog_meter.svgz
rename to oxygen/widgets/analog_meter.svgz
diff --git a/widgets/arrows.svgz b/oxygen/widgets/arrows.svgz
similarity index 100%
rename from widgets/arrows.svgz
rename to oxygen/widgets/arrows.svgz
diff --git a/widgets/background.svgz b/oxygen/widgets/background.svgz
similarity index 100%
rename from widgets/background.svgz
rename to oxygen/widgets/background.svgz
diff --git a/widgets/bar_meter_horizontal.svgz b/oxygen/widgets/bar_meter_horizontal.svgz
similarity index 100%
rename from widgets/bar_meter_horizontal.svgz
rename to oxygen/widgets/bar_meter_horizontal.svgz
diff --git a/widgets/bar_meter_vertical.svgz b/oxygen/widgets/bar_meter_vertical.svgz
similarity index 100%
rename from widgets/bar_meter_vertical.svgz
rename to oxygen/widgets/bar_meter_vertical.svgz
diff --git a/widgets/branding.svgz b/oxygen/widgets/branding.svgz
similarity index 100%
rename from widgets/branding.svgz
rename to oxygen/widgets/branding.svgz
diff --git a/widgets/busywidget.svgz b/oxygen/widgets/busywidget.svgz
similarity index 100%
rename from widgets/busywidget.svgz
rename to oxygen/widgets/busywidget.svgz
diff --git a/widgets/button.svgz b/oxygen/widgets/button.svgz
similarity index 100%
rename from widgets/button.svgz
rename to oxygen/widgets/button.svgz
diff --git a/widgets/calendar.svgz b/oxygen/widgets/calendar.svgz
similarity index 100%
rename from widgets/calendar.svgz
rename to oxygen/widgets/calendar.svgz
diff --git a/widgets/clock.svgz b/oxygen/widgets/clock.svgz
similarity index 100%
rename from widgets/clock.svgz
rename to oxygen/widgets/clock.svgz
diff --git a/widgets/configuration-icons.svgz b/oxygen/widgets/configuration-icons.svgz
similarity index 100%
rename from widgets/configuration-icons.svgz
rename to oxygen/widgets/configuration-icons.svgz
diff --git a/widgets/containment-controls.svgz b/oxygen/widgets/containment-controls.svgz
similarity index 100%
rename from widgets/containment-controls.svgz
rename to oxygen/widgets/containment-controls.svgz
diff --git a/widgets/dragger.svgz b/oxygen/widgets/dragger.svgz
similarity index 100%
rename from widgets/dragger.svgz
rename to oxygen/widgets/dragger.svgz
diff --git a/widgets/extender-background.svgz b/oxygen/widgets/extender-background.svgz
similarity index 100%
rename from widgets/extender-background.svgz
rename to oxygen/widgets/extender-background.svgz
diff --git a/widgets/extender-dragger.svgz b/oxygen/widgets/extender-dragger.svgz
similarity index 100%
rename from widgets/extender-dragger.svgz
rename to oxygen/widgets/extender-dragger.svgz
diff --git a/widgets/frame.svgz b/oxygen/widgets/frame.svgz
similarity index 100%
rename from widgets/frame.svgz
rename to oxygen/widgets/frame.svgz
diff --git a/widgets/glowbar.svgz b/oxygen/widgets/glowbar.svgz
similarity index 100%
rename from widgets/glowbar.svgz
rename to oxygen/widgets/glowbar.svgz
diff --git a/widgets/line.svgz b/oxygen/widgets/line.svgz
similarity index 100%
rename from widgets/line.svgz
rename to oxygen/widgets/line.svgz
diff --git a/widgets/monitor.svgz b/oxygen/widgets/monitor.svgz
similarity index 100%
rename from widgets/monitor.svgz
rename to oxygen/widgets/monitor.svgz
diff --git a/widgets/pager.svgz b/oxygen/widgets/pager.svgz
similarity index 100%
rename from widgets/pager.svgz
rename to oxygen/widgets/pager.svgz
diff --git a/widgets/panel-background.svgz b/oxygen/widgets/panel-background.svgz
similarity index 100%
rename from widgets/panel-background.svgz
rename to oxygen/widgets/panel-background.svgz
diff --git a/widgets/plot-background.svgz b/oxygen/widgets/plot-background.svgz
similarity index 100%
rename from widgets/plot-background.svgz
rename to oxygen/widgets/plot-background.svgz
diff --git a/widgets/scrollbar.svgz b/oxygen/widgets/scrollbar.svgz
similarity index 100%
rename from widgets/scrollbar.svgz
rename to oxygen/widgets/scrollbar.svgz
diff --git a/widgets/slider.svgz b/oxygen/widgets/slider.svgz
similarity index 100%
rename from widgets/slider.svgz
rename to oxygen/widgets/slider.svgz
diff --git a/widgets/systemtray.svgz b/oxygen/widgets/systemtray.svgz
similarity index 100%
rename from widgets/systemtray.svgz
rename to oxygen/widgets/systemtray.svgz
diff --git a/widgets/tasks.svgz b/oxygen/widgets/tasks.svgz
similarity index 100%
rename from widgets/tasks.svgz
rename to oxygen/widgets/tasks.svgz
diff --git a/widgets/toolbox.svgz b/oxygen/widgets/toolbox.svgz
similarity index 100%
rename from widgets/toolbox.svgz
rename to oxygen/widgets/toolbox.svgz
diff --git a/widgets/tooltip.svgz b/oxygen/widgets/tooltip.svgz
similarity index 100%
rename from widgets/tooltip.svgz
rename to oxygen/widgets/tooltip.svgz
diff --git a/widgets/translucentbackground.svgz b/oxygen/widgets/translucentbackground.svgz
similarity index 100%
rename from widgets/translucentbackground.svgz
rename to oxygen/widgets/translucentbackground.svgz
diff --git a/widgets/viewitem.svgz b/oxygen/widgets/viewitem.svgz
similarity index 100%
rename from widgets/viewitem.svgz
rename to oxygen/widgets/viewitem.svgz